From aa814e9994a5d14789bb2d3c348e5f9aeee51e7d Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sun, 21 Apr 2013 11:50:45 -0700 Subject: [PATCH] Cleanup. --- src/renderer_gl.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 57e0b750..6362a6d7 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -1763,7 +1763,7 @@ namespace bgfx , GL_RENDERBUFFER , m_colorRbo ) ); - + GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, m_fbo[1]) ); } else @@ -2337,6 +2337,10 @@ namespace bgfx } #if !BGFX_CONFIG_RENDERER_OPENGLES3 + s_vertexAttribDivisor = stubVertexAttribDivisor; + s_drawArraysInstanced = stubDrawArraysInstanced; + s_drawElementsInstanced = stubDrawElementsInstanced; + if (s_extension[Extension::ARB_instanced_arrays].m_supported || s_extension[Extension::ANGLE_instanced_arrays].m_supported) { @@ -2348,12 +2352,6 @@ namespace bgfx s_drawArraysInstanced = glDrawArraysInstanced; s_drawElementsInstanced = glDrawElementsInstanced; } - else - { - s_vertexAttribDivisor = stubVertexAttribDivisor; - s_drawArraysInstanced = stubDrawArraysInstanced; - s_drawElementsInstanced = stubDrawElementsInstanced; - } } #endif // !BGFX_CONFIG_RENDERER_OPENGLES3