Skip to content

Commit 0c151a6

Browse files
committed
sdl_glimp: move some GL4ES disablement to display them together
1 parent 262423d commit 0c151a6

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

src/engine/sys/sdl_glimp.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,6 +2107,27 @@ static void GLimp_InitExtensions()
21072107

21082108
logger.Notice("...using shading language version %i", glConfig.shadingLanguageVersion );
21092109

2110+
glConfig.incrementalShaderCompilation = r_incrementalShaderCompilation.Get();
2111+
2112+
glConfig.mat3x2Available = r_useMat3x2.Get();
2113+
2114+
if ( glConfig.driverVendor == glDriverVendor_t::GL4ES )
2115+
{
2116+
if ( glConfig.incrementalShaderCompilation
2117+
&& workaround_glDriver_gl4es_disableIncrementalShaderCompilation.Get() )
2118+
{
2119+
logger.Notice( "Found GL4ES translation layer with OpenGL ES backend, disable incremental shader compilation." );
2120+
glConfig.incrementalShaderCompilation = false;
2121+
}
2122+
2123+
if ( glConfig.mat3x2Available
2124+
&& workaround_glDriver_gl4es_disableMat3x2.Get() )
2125+
{
2126+
logger.Notice( "Found GL4ES translation layer with OpenGL ES backend, disable mat3x2 GLSL support." );
2127+
glConfig.mat3x2Available = false;
2128+
}
2129+
}
2130+
21102131

21112132
// OpenGL driver constants.
21122133

@@ -2713,27 +2734,6 @@ static void GLimp_InitExtensions()
27132734
}
27142735
#endif
27152736

2716-
glConfig.incrementalShaderCompilation = r_incrementalShaderCompilation.Get();
2717-
2718-
glConfig.mat3x2Available = r_useMat3x2.Get();
2719-
2720-
if ( glConfig.driverVendor == glDriverVendor_t::GL4ES )
2721-
{
2722-
if ( glConfig.incrementalShaderCompilation
2723-
&& workaround_glDriver_gl4es_disableIncrementalShaderCompilation.Get() )
2724-
{
2725-
logger.Notice( "Found GL4ES translation layer with OpenGL ES backend, disable incremental shader compilation." );
2726-
glConfig.incrementalShaderCompilation = false;
2727-
}
2728-
2729-
if ( glConfig.mat3x2Available
2730-
&& workaround_glDriver_gl4es_disableMat3x2.Get() )
2731-
{
2732-
logger.Notice( "Found GL4ES translation layer with OpenGL ES backend, disable mat3x2 GLSL support." );
2733-
glConfig.mat3x2Available = false;
2734-
}
2735-
}
2736-
27372737
// Shader limits.
27382738

27392739
// From GL_ARB_vertex_shader.

0 commit comments

Comments
 (0)