Move some classes around for PushBuffer#1682
Merged
VReaperV merged 1 commit intoDaemonEngine:masterfrom Jun 24, 2025
Merged
Conversation
This was referenced Jun 23, 2025
Merged
slipher
reviewed
Jun 23, 2025
| void UpdateShaderProgramUniformLocations( GLShader* shader, ShaderProgramDescriptor* shaderProgram ) const; | ||
| }; | ||
|
|
||
| class GLUniform |
Member
There was a problem hiding this comment.
gl_shader.h is GPL licensed while GLMemory.h is BSD
Contributor
Author
There was a problem hiding this comment.
But the only thing that was moved there was added on afterwards, it wasn't part of the original code.
Member
There was a problem hiding this comment.
Oops I though GLUniform was being pulled out, but it only moved within the file.
slipher
reviewed
Jun 23, 2025
| void UpdateShaderProgramUniformLocations( GLShader* shader, ShaderProgramDescriptor* shaderProgram ) const; | ||
| }; | ||
|
|
||
| class GLUniform |
Member
There was a problem hiding this comment.
Oops I though GLUniform was being pulled out, but it only moved within the file.
VReaperV
force-pushed
the
push-buffer-classes
branch
from
7c603bd to
a07d003
Compare
Contributor
Author
|
(rebased) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requires #1681
Move
GLBufferand its derivatives toGLMemoryto avoid circular includes.Also moved
GLUniformbeforeGLShaderManagerbecause its definition will be required there forPushBuffer.