Skip to content

Skip lightmap + deluxegrid shader permutations compilation and skip “proxy” shader compilation #1927

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 3 commits into from
Mar 14, 2026
+16 −29
Merged

Skip lightmap + deluxegrid shader permutations compilation and skip “proxy” shader compilation #1927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37f95c0
gl_shader: print shader name in link log in GLShaderManager::BuildSha…
illwieckz Mar 9, 2026
539eaac
gl_shader: delete unused GLShaderManager::LinkProgram()
illwieckz Mar 9, 2026
4d70088
gl_shader: make possible to never compile a shader, do it for “proxy”
illwieckz Mar 9, 2026
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
31 changes: 6 additions & 25 deletions src/engine/renderer/gl_shader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ void GLShaderManager::BuildShaderProgram( ShaderProgramDescriptor* descriptor )
glGetProgramiv( program, GL_LINK_STATUS, &linked );

if ( !linked ) {
Log::Warn( "Link log:" );
Log::Warn( "Link log for %s:", descriptor->mainShader );
Log::Warn( GetInfoLog( program ) );
ThrowShaderError( "Shader program failed to link!" );
}
Expand Down Expand Up @@ -1065,6 +1065,10 @@ bool GLShaderManager::BuildPermutation( GLShader* shader, int index, const bool
return false;
}

if ( shader->SkipCompilation() ) {
return false;
}

if ( IsUnusedPermutation( compileMacros.c_str() ) ) {
return false;
}
Expand Down Expand Up @@ -1984,29 +1988,6 @@ std::string GLShaderManager::GetInfoLog( GLuint object ) const
return out;
}

void GLShaderManager::LinkProgram( GLuint program ) const
{
GLint linked;

#ifdef GL_ARB_get_program_binary
// Apparently, this is necessary to get the binary program via glGetProgramBinary
if( glConfig.getProgramBinaryAvailable )
{
glProgramParameteri( program, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE );
}
#endif
glLinkProgram( program );

glGetProgramiv( program, GL_LINK_STATUS, &linked );

if ( !linked )
{
Log::Warn( "Link log:" );
Log::Warn( GetInfoLog( program ) );
ThrowShaderError( "Shaders failed to link!" );
}
}

void GLShaderManager::BindAttribLocations( GLuint program ) const
{
for ( uint32_t i = 0; i < ATTR_INDEX_MAX; i++ )
Expand Down Expand Up @@ -3036,7 +3017,7 @@ GlobalUBOProxy::GlobalUBOProxy() :
/* HACK: A GLShader* is required to initialise uniforms,
but we don't need the GLSL shader itself, so we won't actually build it */
GLShader( "proxy", 0,
false, "screenSpace", "generic", true ),
false, "screenSpace", "generic", true, true ),
// CONST
u_ColorMap3D( this ),
u_DepthMap( this ),
Expand Down
14 changes: 10 additions & 4 deletions src/engine/renderer/gl_shader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ class GLShader {

const bool worldShader;
const bool pushSkip;
const bool compileSkip;
protected:
int _activeMacros = 0;
int _deformIndex = 0;
Expand All @@ -212,7 +213,7 @@ class GLShader {
GLShader( const std::string& name, uint32_t vertexAttribsRequired,
const bool useMaterialSystem,
const std::string newVertexShaderName, const std::string newFragmentShaderName,
const bool newPushSkip = false ) :
const bool newPushSkip = false, const bool compileSkip = false ) :
_name( name ),
_vertexAttribsRequired( vertexAttribsRequired ),
_useMaterialSystem( useMaterialSystem ),
Expand All @@ -222,7 +223,8 @@ class GLShader {
hasFragmentShader( true ),
hasComputeShader( false ),
worldShader( false ),
pushSkip( newPushSkip ) {
pushSkip( newPushSkip ),
compileSkip( compileSkip ) {
}

GLShader( const std::string& name,
Expand All @@ -236,7 +238,8 @@ class GLShader {
hasFragmentShader( false ),
hasComputeShader( true ),
worldShader( newWorldShader ),
pushSkip( false ) {
pushSkip( false ),
compileSkip( false ) {
}

public:
Expand Down Expand Up @@ -268,6 +271,10 @@ class GLShader {
return currentProgram;
}

bool SkipCompilation() const {
return compileSkip;
}

protected:
void PostProcessUniforms();
uint32_t GetUniqueCompileMacros( size_t permutation, const int type ) const;
Expand Down Expand Up @@ -550,7 +557,6 @@ class GLShaderManager {
std::string BuildDeformShaderText( const std::string& steps );
std::string ProcessInserts( const std::string& shaderText ) const;

void LinkProgram( GLuint program ) const;
void BindAttribLocations( GLuint program ) const;
void PrintShaderSource( Str::StringRef programName, GLuint object, std::vector<InfoLogEntry>& infoLogLines ) const;

Expand Down
Loading