ShaderGen: Output uint when logic op is enabled for D3D ubershaders #6026
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
stenzek
commented
Sep 5, 2017
| @@ -162,5 +162,5 @@ ShaderCode GeneratePixelShaderCode(APIType ApiType, const ShaderHostConfig& host | |||
| const pixel_shader_uid_data* uid_data); | |||
| void WritePixelShaderCommonHeader(ShaderCode& out, APIType ApiType, u32 num_texgens, | |||
| bool per_pixel_lighting, bool bounding_box); | |||
| ShaderCode GeneratePixelShaderCode(APIType ApiType, const pixel_shader_uid_data* uid_data); | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
Currently, this is only the logic op bit, but this will be extended to the framebuffer fetch/blend modes. In the future, when/if we move to VideoCommon pipelines, this state will be part of the pipeline UID anyway, and we can mask it out in the backend by using a two-level map, so the shaders/programs are shared.
iwubcode
approved these changes
Sep 6, 2017
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.
Fixes broken logic op in D3D with ubershaders enabled, as this wasn't tested before #6013 was merged.
Also partially resolves my issue with host uid bits in the shader creating duplicate shaders, by clearing the uint_output bit if the backend isn't D3D.
This will likely be extended to the framebuffer fetch/blend modes in #5802. In the future, when/if we move to VideoCommon pipelines, this state will be part of the pipeline UID anyway, and we can mask it out in the backend by using a two-level map, sharing the shaders/programs.