Skip to content

Commit e531da3

Browse files
committed
renderer: minor touchup on ARB_shader_draw_parameters enablement
1 parent d442add commit e531da3

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/engine/sys/sdl_glimp.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2545,20 +2545,19 @@ static void GLimp_InitExtensions()
25452545
glConfig2.bindlessTexturesAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_bindless_texture, bindlessTextureEnabled );
25462546
}
25472547

2548-
// made required in OpenGL 4.6
2549-
2550-
bool ShaderDrawParametersEnabled = r_arb_shader_draw_parameters.Get();
2548+
bool shaderDrawParametersEnabled = r_arb_shader_draw_parameters.Get();
25512549

2552-
if ( ShaderDrawParametersEnabled
2553-
&& GL_ARB_shader_draw_parameters
2550+
if ( shaderDrawParametersEnabled
2551+
&& SILENTLY_CHECK_EXTENSION( ARB_shader_draw_parameters )
25542552
&& glConfig2.shadingLanguageVersion <= 120
25552553
&& workaround_glExtension_glsl120_disableShaderDrawParameters.Get() )
25562554
{
25572555
logger.Warn( "Found ARB_shader_draw_parameters with incompatible GLSL 1.20, disabling ARB_shader_draw_parameters." );
2558-
ShaderDrawParametersEnabled = false;
2556+
shaderDrawParametersEnabled = false;
25592557
}
25602558

2561-
glConfig2.shaderDrawParametersAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_draw_parameters, ShaderDrawParametersEnabled );
2559+
// made required in OpenGL 4.6
2560+
glConfig2.shaderDrawParametersAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_draw_parameters, shaderDrawParametersEnabled );
25622561

25632562
// made required in OpenGL 4.3
25642563
glConfig2.SSBOAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_storage_buffer_object, r_arb_shader_storage_buffer_object.Get() );

0 commit comments

Comments
 (0)