Support Sampler binding in the shader. #471
Merged
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
|
Wondering actually if the SAMPLER_BINDING should be renamed to LAYOUT_BINDING since it can be used for vertex attribute binding in the shader in the future. |
| @@ -63,7 +63,7 @@ void SHADER::SetProgramVariables() | |||
| // glsl shader must be bind to set samplers | |||
| Bind(); | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
Woo, thanks for doing my work :) :) |
In the cases where we support the binding layout keyword, use it for more than binding UBO location. This changes it so it is supported for samplers as well. Instances when this is enabled is if a device supports GL_ARB_shading_language_420pack, or if it supports GLES 3.10.
|
We no longer call Bind in SetProgramVariables when we support binding layouts. Also rebased on latest master. |
|
LGTM |
delroth
added a commit
that referenced
this pull request
Jul 18, 2014
Support Sampler binding in the shader.
| Bind(); | ||
|
|
||
| // Bind UBO | ||
| // Bind UBO and texture samplers | ||
| if (!g_ActiveConfig.backend_info.bSupportsBindingLayout) |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
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.
In the cases where we support the binding layout keyword, use it for more than binding UBO location.
This changes it so it is supported for samplers as well.
Instances when this is enabled is if a device supports GL_ARB_shading_language_420pack, or if it supports GLES 3.10.