Skip to content

Commit bbb828c

Browse files
committed
renderer: disable ARB_shader_draw_parameters on GLSL 1.20
Disable ARB_shader_draw_parameters on GLSL 1.20, it's not working.
1 parent 450c17e commit bbb828c

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/engine/sys/sdl_glimp.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,7 +2051,6 @@ static void GLimp_InitExtensions()
20512051

20522052
logger.Notice("...using shading language version %i", glConfig2.shadingLanguageVersion );
20532053

2054-
20552054
// OpenGL driver constants.
20562055

20572056
glGetIntegerv( GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &glConfig2.maxTextureUnits );
@@ -2522,8 +2521,16 @@ static void GLimp_InitExtensions()
25222521
glConfig2.bindlessTexturesAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_bindless_texture, bindlessTextureEnabled );
25232522
}
25242523

2524+
2525+
bool ShaderDrawParameterEnabled = true;
2526+
if ( glConfig2.shadingLanguageVersion <= 120 )
2527+
{
2528+
logger.Warn( "Found GLSL 1.20, disabling ARB_shader_draw_parameters." );
2529+
ShaderDrawParameterEnabled = false;
2530+
}
2531+
25252532
// made required in OpenGL 4.6
2526-
glConfig2.shaderDrawParametersAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_draw_parameters, r_arb_shader_draw_parameters.Get() );
2533+
glConfig2.shaderDrawParametersAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_draw_parameters, r_arb_shader_draw_parameters.Get() && ShaderDrawParameterEnabled );
25272534

25282535
// made required in OpenGL 4.3
25292536
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)