NUKE useless GLUniformBlock::GetName()

VReaperV · VReaperV · commit d5ffdf3e7a5e · 2025-06-22T09:38:21.000+03:00
diff --git a/src/engine/renderer/gl_shader.h b/src/engine/renderer/gl_shader.h
@@ -1100,8 +1100,8 @@ class GLUniformMatrix34fv : protected GLUniform
 class GLUniformBlock
 {
 protected:
-	GLShader   *_shader;
-	std::string _name;
+	GLShader *_shader;
+	const std::string _name;
 	size_t      _locationIndex; // Only valid if GL_ARB_shading_language_420pack is not available
 	const GLuint _bindingPoint; // Only valid if GL_ARB_shading_language_420pack is available
 
@@ -1119,14 +1119,9 @@ class GLUniformBlock
 		_locationIndex = index;
 	}
 
-	const char *GetName()
-	{
-		return _name.c_str();
-	}
-
 	void UpdateShaderProgramUniformBlockIndex( ShaderProgramDescriptor* shaderProgram )
 	{
-		shaderProgram->uniformBlockIndexes[_locationIndex] = glGetUniformBlockIndex( shaderProgram->id, GetName() );
+		shaderProgram->uniformBlockIndexes[_locationIndex] = glGetUniformBlockIndex( shaderProgram->id, _name.c_str() );
 	}
 
 	void SetBuffer( GLuint buffer ) {

Original file line number	Diff line number	Diff line change
`@@ -1100,8 +1100,8 @@ class GLUniformMatrix34fv : protected GLUniform`
`1100`	`1100`	`class GLUniformBlock`
`1101`	`1101`	`{`
`1102`	`1102`	`protected:`
`1103`		`- GLShader *_shader;`
`1104`		`- std::string _name;`
	`1103`	`+ GLShader *_shader;`
	`1104`	`+ const std::string _name;`
`1105`	`1105`	`size_t _locationIndex; // Only valid if GL_ARB_shading_language_420pack is not available`
`1106`	`1106`	`const GLuint _bindingPoint; // Only valid if GL_ARB_shading_language_420pack is available`
`1107`	`1107`
`@@ -1119,14 +1119,9 @@ class GLUniformBlock`
`1119`	`1119`	`_locationIndex = index;`
`1120`	`1120`	`}`
`1121`	`1121`
`1122`		`- const char *GetName()`
`1123`		`- {`
`1124`		`- return _name.c_str();`
`1125`		`- }`
`1126`		`-`
`1127`	`1122`	`void UpdateShaderProgramUniformBlockIndex( ShaderProgramDescriptor* shaderProgram )`
`1128`	`1123`	`{`
`1129`		`- shaderProgram->uniformBlockIndexes[_locationIndex] = glGetUniformBlockIndex( shaderProgram->id, GetName() );`
	`1124`	`+ shaderProgram->uniformBlockIndexes[_locationIndex] = glGetUniformBlockIndex( shaderProgram->id, _name.c_str() );`
`1130`	`1125`	`}`
`1131`	`1126`
`1132`	`1127`	`void SetBuffer( GLuint buffer ) {`