ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TextureCache::TCacheEntry::FromRenderTarget as vbo 

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
This commit is contained in:
degasus 2012-12-08 00:54:38 +01:00 committed by Ryan Houdek
parent 6b3125728b
commit d44228f1b7
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
View File

@ -57,6 +57,7 @@ namespace OGL
{ {
static u32 s_TempFramebuffer = 0; static u32 s_TempFramebuffer = 0;
static GLuint s_VBO = 0;
static const GLint c_MinLinearFilter[8] = { static const GLint c_MinLinearFilter[8] = {
GL_NEAREST, GL_NEAREST,
@ -306,19 +307,20 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect); TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect);
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
GLfloat tex1[] = { GLfloat vertices[] = {
(GLfloat)targetSource.left, (GLfloat)targetSource.bottom, -1.f, 1.f,
(GLfloat)targetSource.left, (GLfloat)targetSource.top, (GLfloat)targetSource.left, (GLfloat)targetSource.bottom,
(GLfloat)targetSource.right, (GLfloat)targetSource.top, -1.f, -1.f,
(GLfloat)targetSource.right, (GLfloat)targetSource.bottom (GLfloat)targetSource.left, (GLfloat)targetSource.top,
}; 1.f, -1.f,
GLfloat vtx1[] = { (GLfloat)targetSource.right, (GLfloat)targetSource.top,
-1.f, 1.f, 1.f, 1.f,
-1.f, -1.f, (GLfloat)targetSource.right, (GLfloat)targetSource.bottom
1.f, -1.f,
1.f, 1.f
}; };
glBindBuffer(GL_ARRAY_BUFFER, s_VBO);
glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW);
// disable all pointer, TODO: use VAO // disable all pointer, TODO: use VAO
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB);
@ -335,9 +337,12 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
} }
glClientActiveTexture(GL_TEXTURE0); glClientActiveTexture(GL_TEXTURE0);
glTexCoordPointer(2, GL_FLOAT, 0, tex1); glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL + 2);
glVertexPointer(2, GL_FLOAT, 0, vtx1); glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*4, 0);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
// TODO: this should be removed if we use vbo everywhere
glBindBuffer(GL_ARRAY_BUFFER, 0);
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
@ -415,13 +420,21 @@ void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, co
(float)(1 << g_ActiveConfig.iMaxAnisotropy)); (float)(1 << g_ActiveConfig.iMaxAnisotropy));
} }
TextureCache::TextureCache()
{
glGenBuffers(1, &s_VBO);
}
TextureCache::~TextureCache() TextureCache::~TextureCache()
{ {
if (s_TempFramebuffer) glDeleteBuffers(1, &s_VBO);
if (s_TempFramebuffer)
{ {
glDeleteFramebuffersEXT(1, (GLuint*)&s_TempFramebuffer); glDeleteFramebuffersEXT(1, (GLuint*)&s_TempFramebuffer);
s_TempFramebuffer = 0; s_TempFramebuffer = 0;
} }
} }
void TextureCache::DisableStage(unsigned int stage) void TextureCache::DisableStage(unsigned int stage)

1
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
View File

@ -32,6 +32,7 @@ namespace OGL
class TextureCache : public ::TextureCache class TextureCache : public ::TextureCache
{ {
public: public:
TextureCache();
static void DisableStage(unsigned int stage); static void DisableStage(unsigned int stage);
private: private: