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

fix software backend 

ogl rasterfont sets vao and vbo, but both aren't used on software backend
This commit is contained in:
degasus 2013-03-17 12:37:37 +01:00
parent 2312a8d9d5
commit 7597b8b8d5
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
View File

@ -20,6 +20,7 @@
#include "../../Plugin_VideoOGL/Src/GLUtil.h" #include "../../Plugin_VideoOGL/Src/GLUtil.h"
#include "../../Plugin_VideoOGL/Src/RasterFont.h" #include "../../Plugin_VideoOGL/Src/RasterFont.h"
#include "../../Plugin_VideoOGL/Src/ProgramShaderCache.h"
#include "SWRenderer.h" #include "SWRenderer.h"
#include "SWStatistics.h" #include "SWStatistics.h"
@ -30,6 +31,7 @@ static GLint uni_tex = -1;
static GLuint program; static GLuint program;
// Rasterfont isn't compatible with GLES // Rasterfont isn't compatible with GLES
// degasus: I think it does, but I can't test it
#ifndef USE_GLES #ifndef USE_GLES
OGL::RasterFont* s_pfont = NULL; OGL::RasterFont* s_pfont = NULL;
#endif #endif
@ -45,6 +47,7 @@ void SWRenderer::Shutdown()
#ifndef USE_GLES #ifndef USE_GLES
delete s_pfont; delete s_pfont;
s_pfont = 0; s_pfont = 0;
OGL::ProgramShaderCache::Shutdown();
#endif #endif
} }
@ -87,6 +90,8 @@ void SWRenderer::Prepare()
CreateShaders(); CreateShaders();
// TODO: Enable for GLES once RasterFont supports GLES // TODO: Enable for GLES once RasterFont supports GLES
#ifndef USE_GLES #ifndef USE_GLES
// ogl rasterfont depends on ogl programshadercache
OGL::ProgramShaderCache::Init();
s_pfont = new OGL::RasterFont(); s_pfont = new OGL::RasterFont();
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
#endif #endif
@ -103,6 +108,9 @@ void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color)
left * 2.0f / (float)nBackbufferWidth - 1, left * 2.0f / (float)nBackbufferWidth - 1,
1 - top * 2.0f / (float)nBackbufferHeight, 1 - top * 2.0f / (float)nBackbufferHeight,
0, nBackbufferWidth, nBackbufferHeight, color); 0, nBackbufferWidth, nBackbufferHeight, color);
glBindVertexArray(0);
glBindBuffer(GL_ARRAY_BUFFER, 0);
#endif #endif
} }