Simplify some GLSL shader loading code#1220
Closed
VReaperV wants to merge 1 commit intoDaemonEngine:masterfrom
Closed
Simplify some GLSL shader loading code#1220VReaperV wants to merge 1 commit intoDaemonEngine:masterfrom
VReaperV wants to merge 1 commit intoDaemonEngine:masterfrom
Conversation
slipher
reviewed
Jul 16, 2024
| Str::StringRef compileMacros, int deformIndex ) | ||
| { | ||
| GLShaderManager::CompileGPUShaders( shader, program, compileMacros ); | ||
| if ( ( !baseProgram->VS && shader->_hasVertexShader ) || ( !baseProgram->FS && shader->_hasFragmentShader ) |
Member
There was a problem hiding this comment.
It's kinda confusing that program and baseProgram can be the same. I'm not convinced that this refactoring is really simpler.
Contributor
Author
There was a problem hiding this comment.
Alternatively, code from CompileAndLinkGPUShaderProgram() can be moved to buildPermutation() and baseProgram set to program explicitly for deformIndex == 0.
VReaperV
force-pushed
the
simplify-build-permutation
branch
from
b2a1bc1 to
6b06dd7
Compare
Merge the two branches in `GLShaderManager::buildPermutation()` into one since they were doing essentially the same thing.
Change some variable names to avoid confusion between shader and shader programs, fixed some formatting like whitespaces in [] and missing {} in if statements. Removed a redundant namespace in function call.
VReaperV
force-pushed
the
simplify-build-permutation
branch
from
6b06dd7 to
8725226
Compare
Contributor
Author
|
This code was removed by #1586. |
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
3 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.
Make somewhat messy code I noticed while working on #1105 and subsequent prs into something more readable.
Merge the two branches in
GLShaderManager::buildPermutation()into one since they were doing essentially the same thing. Change some variable names to avoid confusion between shader and shader programs, fixed some formatting like whitespaces in [] and missing {} in if statements. Removed a redundant namespace in function call.There is technically a slight difference in that compute shaders may be loaded even if
deformIndexis > 0, but I don't think that really matters.