-
Notifications
You must be signed in to change notification settings - Fork 456
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
Replaced DX11 HLSL shading language with the more accurate SM_5_0 #2078
Open
num3ric
wants to merge
1
commit into
AcademySoftwareFoundation:main
Choose a base branch
from
num3ric:hlsl_sm5
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -265,7 +265,7 @@ const char * GpuLanguageToString(GpuLanguage language) | |
case GPU_LANGUAGE_GLSL_4_0: return "glsl_4.0"; | ||
case GPU_LANGUAGE_GLSL_ES_1_0: return "glsl_es_1.0"; | ||
case GPU_LANGUAGE_GLSL_ES_3_0: return "glsl_es_3.0"; | ||
case GPU_LANGUAGE_HLSL_DX11: return "hlsl_dx11"; | ||
case GPU_LANGUAGE_HLSL_SM_5_0: return "hlsl_sm_5.0"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't remember... so let me know if any precautions are needed here as this change would cause cache id invalidation. |
||
case GPU_LANGUAGE_MSL_2_0: return "msl_2"; | ||
case LANGUAGE_OSL_1: return "osl_1"; | ||
} | ||
|
@@ -284,7 +284,7 @@ GpuLanguage GpuLanguageFromString(const char * s) | |
else if(str == "glsl_4.0") return GPU_LANGUAGE_GLSL_4_0; | ||
else if(str == "glsl_es_1.0") return GPU_LANGUAGE_GLSL_ES_1_0; | ||
else if(str == "glsl_es_3.0") return GPU_LANGUAGE_GLSL_ES_3_0; | ||
else if(str == "hlsl_dx11") return GPU_LANGUAGE_HLSL_DX11; | ||
else if(str == "hlsl_sm_5.0") return GPU_LANGUAGE_HLSL_SM_5_0; | ||
else if(str == "osl_1") return LANGUAGE_OSL_1; | ||
else if(str == "msl_2") return GPU_LANGUAGE_MSL_2_0; | ||
|
||
|
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't remember exactly but didn't you mention the use of OCIO_DEPRECATED macro? Would it work here? Looking at the attribute [[depracated]] I think it should but not sure about the other fallback methods.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed my previous comment about this because I thought it might be needlessly disruptive.
If we did want it however, it would require modifications to the macro for MSVC: the fix for
__cplusplus
in Aras P's other PR, and the deletion of__declspec(deprecated(msg))
which doesn't work with enums.