Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle vec3 colors correctly in custom shaders #9964

Merged
merged 1 commit into from
Dec 6, 2021

Conversation

ptrgags
Copy link
Contributor

@ptrgags ptrgags commented Dec 6, 2021

Don't merge this until #9960 is merged first.

This continues the saga of #9955 and #9957, looks like I missed a spot in CustomShaderPipelineStage -- looks like I wasn't using ModelExperimentalUtility.getAttributeInfo which computes the correct GLSL type of vec4 in this case.

@lilleyse could you review?

Use this local Sandcastle -- last item in the dropdown. I updated the shader to use fsInput.attributes.color_0, now it doesn't crash like in previous branches.

@cesium-concierge
Copy link

Thanks for the pull request @ptrgags!

  • ✔️ Signed CLA found.

Reviewers, don't forget to make sure that:

  • Cesium Viewer works.
  • Works in 2D/CV.

@ptrgags ptrgags changed the base branch from main to custom-shaders-point-size December 6, 2021 15:45
Base automatically changed from custom-shaders-point-size to main December 6, 2021 16:01
@ptrgags ptrgags marked this pull request as ready for review December 6, 2021 16:08
@ptrgags
Copy link
Contributor Author

ptrgags commented Dec 6, 2021

@lilleyse synced with main

@ptrgags ptrgags force-pushed the color-vec3-custom-shaders branch from d57d1a1 to d311ce2 Compare December 6, 2021 16:33
@ptrgags
Copy link
Contributor Author

ptrgags commented Dec 6, 2021

@lilleyse reset the branch to untangle the confusing git history

@lilleyse
Copy link
Contributor

lilleyse commented Dec 6, 2021

Thanks @ptrgags

@lilleyse lilleyse merged commit 5c4f9af into main Dec 6, 2021
@lilleyse lilleyse deleted the color-vec3-custom-shaders branch December 6, 2021 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants