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

[shaderc] Clean up #3258

Merged
merged 11 commits into from
Feb 27, 2024
Merged

[shaderc] Clean up #3258

merged 11 commits into from
Feb 27, 2024

Conversation

phniix
Copy link
Contributor

@phniix phniix commented Feb 25, 2024

Dependency on first merging #3213

…ion options from: https://developer.apple.com/documentation/metal/mtllanguageversion?language=objc

Add configuration options for MSL compiler based on MSL version and Platform
Configure MSL->SPIR-V version configuration based on when ray tracing types become available
Set default metal compiler option to be metal 1.2, which is the default version assigned in the current SPIRV-Cross being used
…ion options from: https://developer.apple.com/documentation/metal/mtllanguageversion?language=objc

Add configuration options for MSL compiler based on MSL version and Platform
Configure MSL->SPIR-V version configuration based on when ray tracing types become available
Set default metal compiler option to be metal 1.2, which is the default version assigned in the current SPIRV-Cross being used
Reduce the size of temp buffer used in writing the MSL preprocessor define
Fix a compiler warning about size_t to int32_t truncation
Adjust whitespace in usage text
@bkaradzic
Copy link
Owner

There are conflicts.

# Conflicts:
#	tools/shaderc/shaderc.cpp
#	tools/shaderc/shaderc_metal.cpp
@phniix
Copy link
Contributor Author

phniix commented Feb 27, 2024

There are conflicts.

They should all be resolved now.

@bkaradzic bkaradzic merged commit 56ad576 into bkaradzic:master Feb 27, 2024
11 checks passed
mipek pushed a commit to mipek/bgfx that referenced this pull request Mar 2, 2024
* Add Metal Shading Language version options to shaderc. Reference version options from: https://developer.apple.com/documentation/metal/mtllanguageversion?language=objc
Add configuration options for MSL compiler based on MSL version and Platform
Configure MSL->SPIR-V version configuration based on when ray tracing types become available
Set default metal compiler option to be metal 1.2, which is the default version assigned in the current SPIRV-Cross being used

* Add Metal Shading Language version options to shaderc. Reference version options from: https://developer.apple.com/documentation/metal/mtllanguageversion?language=objc
Add configuration options for MSL compiler based on MSL version and Platform
Configure MSL->SPIR-V version configuration based on when ray tracing types become available
Set default metal compiler option to be metal 1.2, which is the default version assigned in the current SPIRV-Cross being used

* Group ios and osx platform code paths
Reduce the size of temp buffer used in writing the MSL preprocessor define
Fix a compiler warning about size_t to int32_t truncation
Adjust whitespace in usage text

* Remove indented scope left-over from branch condition removal

* Remove some testing code

* Adjust whitespace for function arguments

* Replace BX_ASSERT with bx::write to message handler in spirv generation
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.

2 participants