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

gsdx-debug: remove old assert

This commit is contained in:
Gregory Hainaut 2015-05-18 16:45:38 +02:00
parent 503459798a
commit 19d9349b0b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -391,15 +391,7 @@ void GSDeviceOGL::Flip()
void GSDeviceOGL::BeforeDraw() void GSDeviceOGL::BeforeDraw()
{ {
GL_PUSH("Before Draw Validation & Setup");
m_shader->UseProgram(); m_shader->UseProgram();
#ifdef _DEBUG
ASSERT(gl_CheckFramebufferStatus(GL_DRAW_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE);
#endif
GL_POP();
} }
void GSDeviceOGL::AfterDraw() void GSDeviceOGL::AfterDraw()

4
plugins/GSdx/GSShaderOGL.cpp
View File

@ -239,6 +239,8 @@ GLuint GSShaderOGL::LinkNewProgram()
void GSShaderOGL::UseProgram() void GSShaderOGL::UseProgram()
{ {
GL_PUSH("Use Program And Uniform");
if (GLState::dirty_prog) { if (GLState::dirty_prog) {
if (!GLLoader::found_GL_ARB_separate_shader_objects) { if (!GLLoader::found_GL_ARB_separate_shader_objects) {
GLState::dirty_subroutine_vs = true; GLState::dirty_subroutine_vs = true;
@ -278,6 +280,8 @@ void GSShaderOGL::UseProgram()
SetupSubroutineUniform(); SetupSubroutineUniform();
GLState::dirty_prog = false; GLState::dirty_prog = false;
GL_POP();
} }
std::string GSShaderOGL::GenGlslHeader(const std::string& entry, GLenum type, const std::string& macro) std::string GSShaderOGL::GenGlslHeader(const std::string& entry, GLenum type, const std::string& macro)