Skip to content

renderer: disable ARB_shader_draw_parameters on GLSL 1.20 #1576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
illwieckz merged 1 commit into from
Mar 5, 2025
Merged

renderer: disable ARB_shader_draw_parameters on GLSL 1.20 #1576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/engine/sys/sdl_glimp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ static Cvar::Cvar<bool> workaround_glExtension_missingArbFbo_useExtFbo(
"workaround.glExtension.missingArbFbo.useExtFbo",
"Use EXT_framebuffer_object and EXT_framebuffer_blit when ARB_framebuffer_object is not available",
Cvar::NONE, true );
static Cvar::Cvar<bool> workaround_glExtension_glsl120_disableShaderDrawParameters(
"workaround.glExtension.glsl120.disableShaderDrawParameters",
"Disable ARB_shader_draw_parameters on GLSL 1.20",
Cvar::NONE, true );
static Cvar::Cvar<bool> workaround_glHardware_intel_useFirstProvokinVertex(
"workaround.glHardware.intel.useFirstProvokinVertex",
"Use first provoking vertex on Intel hardware supporting ARB_provoking_vertex",
Expand Down Expand Up @@ -2523,7 +2527,19 @@ static void GLimp_InitExtensions()
}

// made required in OpenGL 4.6
glConfig2.shaderDrawParametersAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_draw_parameters, r_arb_shader_draw_parameters.Get() );

bool ShaderDrawParametersEnabled = r_arb_shader_draw_parameters.Get();

if ( ShaderDrawParametersEnabled
&& GL_ARB_shader_draw_parameters
&& glConfig2.shadingLanguageVersion <= 120
&& workaround_glExtension_glsl120_disableShaderDrawParameters.Get() )
{
logger.Warn( "Found ARB_shader_draw_parameters with incompatible GLSL 1.20, disabling ARB_shader_draw_parameters." );
ShaderDrawParametersEnabled = false;
}

glConfig2.shaderDrawParametersAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_draw_parameters, ShaderDrawParametersEnabled );

// made required in OpenGL 4.3
glConfig2.SSBOAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_storage_buffer_object, r_arb_shader_storage_buffer_object.Get() );
Expand Down Expand Up @@ -2668,6 +2684,7 @@ bool GLimp_Init()
Cvar::Latch( workaround_glDriver_mesa_v241_disableBindlessTexture );
Cvar::Latch( workaround_glDriver_nvidia_v340_disableTextureGather );
Cvar::Latch( workaround_glExtension_missingArbFbo_useExtFbo );
Cvar::Latch( workaround_glExtension_glsl120_disableShaderDrawParameters );
Cvar::Latch( workaround_glHardware_intel_useFirstProvokinVertex );

/* Enable S3TC on Mesa even if libtxc-dxtn is not available
Expand Down