scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-26 16:44:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

GL: Fixed issue #474.

Browse source
This commit is contained in:
Branimir Karadžić 2015-08-11 19:30:33 -07:00
parent f166412693
commit 16037218eb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/renderer_gl.cpp
View file

@ -3185,8 +3185,12 @@ namespace bgfx { namespace gl
GL_CHECK(glBindFragDataLocation(m_id, 0, "bgfx_FragColor") ); GL_CHECK(glBindFragDataLocation(m_id, 0, "bgfx_FragColor") );
#endif // BGFX_CONFIG_RENDERER_OPENGL >= 31 #endif // BGFX_CONFIG_RENDERER_OPENGL >= 31
if (s_extension[Extension::ARB_program_interface_query].m_supported bool piqSupported = BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGLES >= 31) || (true
|| BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGLES >= 31) ) && s_extension[Extension::ARB_program_interface_query].m_supported
&& s_extension[Extension::ARB_shader_storage_buffer_object].m_supported
);
if (piqSupported)
{ {
GL_CHECK(glGetProgramInterfaceiv(m_id, GL_PROGRAM_INPUT, GL_ACTIVE_RESOURCES, &activeAttribs ) ); GL_CHECK(glGetProgramInterfaceiv(m_id, GL_PROGRAM_INPUT, GL_ACTIVE_RESOURCES, &activeAttribs ) );
GL_CHECK(glGetProgramInterfaceiv(m_id, GL_UNIFORM, GL_ACTIVE_RESOURCES, &activeUniforms) ); GL_CHECK(glGetProgramInterfaceiv(m_id, GL_UNIFORM, GL_ACTIVE_RESOURCES, &activeUniforms) );
@ -3223,8 +3227,6 @@ namespace bgfx { namespace gl
m_numPredefined = 0; m_numPredefined = 0;
m_numSamplers = 0; m_numSamplers = 0;
const bool piqSupported = s_extension[Extension::ARB_program_interface_query].m_supported;
BX_TRACE("Uniforms (%d):", activeUniforms); BX_TRACE("Uniforms (%d):", activeUniforms);
for (int32_t ii = 0; ii < activeUniforms; ++ii) for (int32_t ii = 0; ii < activeUniforms; ++ii)
{ {
@ -3241,8 +3243,7 @@ namespace bgfx { namespace gl
GLint num; GLint num;
GLint loc; GLint loc;
if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGLES >= 31) if (piqSupported)
|| piqSupported)
{ {
GL_CHECK(glGetProgramResourceiv(m_id GL_CHECK(glGetProgramResourceiv(m_id
, GL_UNIFORM , GL_UNIFORM
@ -3370,8 +3371,7 @@ namespace bgfx { namespace gl
m_constantBuffer->finish(); m_constantBuffer->finish();
} }
if (s_extension[Extension::ARB_program_interface_query].m_supported if (piqSupported)
|| BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGLES >= 31) )
{ {
struct VariableInfo struct VariableInfo
{ {