Gl fixes #403
Merged
Gl fixes #403
Conversation
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
We really needed a test like this along with 5ef1dcf.
This fixes the problems introduced by 5ef1dcf. The issue is that IECoreGL::PointsPrimitive overrides shaderSetup() in order to tinker with the vertex shader to perform fast instanced rendering of disks, spheres and quads. Because we do want to allow users to provide their own vertex shaders if they wish, the PointsPrimitive makes the assumption that if a vertex source has been specified explicitly, that the user knows what they're doing and will take care of the instancing too. This interacted badly with the new flatConstant() shader that the Primitive was using to override wireframe shading - because that shader was explicitly specifying a vertex source. The solution is simple - use the default vertex source in flatConstant(), and grab the uniformCs variable directly in the fragment source. I should have thought of it in the first place.
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.
This should fix the regressions caused by #400.