Renderer refactor #436
Closed
Renderer refactor #436
Conversation
This file contains 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
vaxerski
reviewed
Jul 23, 2024
| GLuint compileShader(const GLuint& type, std::string src) { | ||
| auto shader = glCreateShader(type); | ||
| [[nodiscard]] GLuint compileShader(GLenum type, const std::string& src) noexcept { | ||
| GLuint shader = glCreateShader(type); |
| 1, 0, // top right | ||
| 0, 0, // top left | ||
| 1, 1, // bottom right | ||
| 0, 1, // bottom left | ||
| }; | ||
|
|
||
| GLuint compileShader(const GLuint& type, std::string src) { | ||
| auto shader = glCreateShader(type); | ||
| [[nodiscard]] GLuint compileShader(GLenum type, const std::string& src) noexcept { |
| @@ -187,27 +176,27 @@ CRenderer::SRenderFeedback CRenderer::renderLock(const CSessionLockSurface& surf | |||
| if (WAITFORASSETS) { | |||
|
|
|||
| // render status | |||
| if (!**PDISABLEBAR) { | |||
| if (!*PDISABLEBAR) { | |||
| glUseProgram(rectShader.program); | ||
|
|
||
| glUniformMatrix3fv(rectShader.proj, 1, GL_TRUE, glMatrix); | ||
| if (col.a >= 0.0f) { // Check if color is provided |
There was a problem hiding this comment.
what if the color is transparent
why not check if the shader uniform exists
|
|
||
| // premultiply the color as well as we don't work with straight alpha | ||
| glUniform4f(rectShader.color, col.r * col.a, col.g * col.a, col.b * col.a, col.a); | ||
| if (rounding > 0) { // Check if rounding is provided |
| } | ||
|
|
||
| } | ||
| )#"; | ||
| }; | ||
|
|
||
| inline const std::string QUADVERTSRC = R"#( | ||
| #version 100 |
| varying highp vec2 v_texcoord; // is in 0-1 | ||
| varying vec4 FragColor; |
| vec3 masks = vec3(equal(maxcVec, col)) * vec3(notEqual(maxcVec, vec3(green, blue, red))); | ||
| vec3 adds = vec3(0.0, 2.0, 4.0) + vec3(green - blue, blue - red, red - green) / delta; | ||
| vec3 masks = vec3(equal(maxcVec, col)) * vec3(notEqual(maxcVec, vec3(col.g, col.b, col.r))); | ||
| vec3 adds = vec3(0.0, 2.0, 4.0) + vec3(col.g - col.b, col.b - col.r, col.r - col.g) / delta; |
There was a problem hiding this comment.
if you are getting rid of these, get rid of the vars too
|
|
||
| hue += dot(adds, masks); | ||
| hue /= 6.0; | ||
| hue += dot(adds, masks)/6.0; |
|
|
||
| glUseProgram(blurFinishShader.program); | ||
| CFramebuffer* targetFB = (currentRenderToFB == &mirrors[0]) ? &mirrors[1] : &mirrors[0]; | ||
| drawPass(&blurFinishShader, targetFB); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Refactor: Extracted logic to separate functions, flattened conditionals for better readability, etc.