Skip to content

Only update PushBuffer if any uniform has actually changed #1685

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

Open
VReaperV wants to merge 4 commits into
base: master
Choose a base branch
from
+134 −400
Open

Only update PushBuffer if any uniform has actually changed #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2db100e
Only update PushBuffer if any uniform has actually changed
VReaperV Jun 23, 2025
03ebb6b
NUKE unused GLUniform.GetSize()
VReaperV Jun 25, 2025
857f94f
Add GLUniform.bufferSize as a shorthand for _std430Size * max( 1, _co…
VReaperV Jun 25, 2025
553f6d9
GLUniform cache clean-up
VReaperV Jan 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
2 changes: 1 addition & 1 deletion libs/breakpad
Open in desktop
Submodule breakpad updated 1 files
+112 −72 README.md
2 changes: 1 addition & 1 deletion libs/crunch
Open in desktop
Submodule crunch updated 3 files
+0 −5 crunch/CMakeLists.txt
+0 −265 crunch/crunch.1
+1 −1 crunch/crunch.cpp
27 changes: 18 additions & 9 deletions src/engine/renderer/gl_shader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@ GLShaderManager::~GLShaderManager()
= default;

void GLShaderManager::FreeAll() {
for ( const std::unique_ptr<GLShader>& shader : _shaders ) {
if ( shader.get()->uniformStorage ) {
Z_Free( shader.get()->uniformStorage );
}
}

_shaders.clear();

deformShaderCount = 0;
Expand All @@ -236,8 +242,8 @@ void GLShaderManager::FreeAll() {
Z_Free( program.uniformBlockIndexes );
}

if ( program.uniformFirewall ) {
Z_Free( program.uniformFirewall );
if ( program.uniformStorage ) {
Z_Free( program.uniformStorage );
}
}

Expand Down Expand Up @@ -266,7 +272,7 @@ void GLShaderManager::UpdateShaderProgramUniformLocations( GLShader* shader, Sha
shaderProgram->uniformLocations = ( GLint* ) Z_Malloc( sizeof( GLint ) * numUniforms );

// create buffer for uniform firewall
shaderProgram->uniformFirewall = ( byte* ) Z_Malloc( uniformSize );
shaderProgram->uniformStorage = ( uint32_t* ) Z_Malloc( uniformSize );

// update uniforms
for (GLUniform *uniform : shader->_uniforms)
Expand Down Expand Up @@ -1273,10 +1279,15 @@ void GLShaderManager::InitShader( GLShader* shader ) {
for ( std::size_t i = 0; i < shader->_uniforms.size(); i++ ) {
GLUniform* uniform = shader->_uniforms[i];
uniform->SetLocationIndex( i );
uniform->SetFirewallIndex( shader->_uniformStorageSize );
shader->_uniformStorageSize += uniform->GetSize();
uniform->SetUniformStorageOffset( shader->_uniformStorageSize );

shader->_uniformStorageSize += uniform->_bufferSize;
}

shader->_uniformStorageSize *= sizeof( uint32_t );

shader->uniformStorage = ( uint32_t* ) Z_Malloc( shader->_uniformStorageSize );

for ( std::size_t i = 0; i < shader->_uniformBlocks.size(); i++ ) {
GLUniformBlock* uniformBlock = shader->_uniformBlocks[i];
uniformBlock->SetLocationIndex( i );
Expand Down Expand Up @@ -2136,10 +2147,6 @@ bool GLCompileMacro_USE_BSP_SURFACE::HasConflictingMacros(size_t permutation, co
return false;
}

uint32_t* GLUniform::WriteToBuffer( uint32_t * ) {
Sys::Error( "WriteToBuffer not implemented for GLUniform '%s'", _name );
}

void GLShader::RegisterUniform( GLUniform* uniform ) {
_uniforms.push_back( uniform );
}
Expand Down Expand Up @@ -2425,6 +2432,8 @@ void GLShader::WriteUniformsToBuffer( uint32_t* buffer, const Mode mode, const i
bufPtr = uniform->WriteToBuffer( bufPtr );
}
}

uniformsUpdated = false;
}

GLShader_generic::GLShader_generic() :
Expand Down
Loading
Loading