-
Notifications
You must be signed in to change notification settings - Fork 81
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
Move shaders into shader library target #1581
Move shaders into shader library target #1581
Conversation
91220e8
to
bcb2dc4
Compare
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.
You probably need to assert in the metal pipeline that the CMake version is at the minimum required for this feature to work.
list(APPEND plClient_SHADERTARGETS | ||
pfMetalPipelineShadersMSL21 | ||
pfMetalPipelineShadersMSL23 | ||
) |
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.
This should probably be pulled in transitively from pfMetalPipeline
target.
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.
I moved what I could but this specific part (the XCODE_EMBED_RESOURCES target property) is not transitive.
What would be the best way to do that? A different cmake_minimum_required or some sort of different check? |
We may not want to use if(${CMAKE_VERSION} VERSION_LESS 3.9)
message(FATAL_ERROR "boo")
endif() |
383ab5d
to
d8545bb
Compare
Just checking in on this PR. I made some changes a few weeks back but haven't seen any feedback yet. |
Sources/Plasma/FeatureLib/pfMetalPipeline/ShaderSrc/GammaCorrection.metal
Outdated
Show resolved
Hide resolved
Looks like this PR needs to be rebased to build. |
Co-authored-by: Adam Johnson <[email protected]>
…pipeline yet - but tests out the shader library builds.
Also removing another leftover from the old shader inclusion system
…ction.metal Co-authored-by: Adam Johnson <[email protected]>
b9a1837
to
9484a07
Compare
I went ahead and rebased pulling in @dpogue's latest Mac fixes. Waiting to see if the build is green. |
It looks like builds are passing again on this PR. |
32cc7a3
to
7d488a0
Compare
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.
This looks fine to me, but I'd like to hear from @dpogue as well.
Sources/Plasma/FeatureLib/pfMetalPipeline/plMetalDeviceLibraryLoader.mm
Outdated
Show resolved
Hide resolved
Sources/Plasma/FeatureLib/pfMetalPipeline/ShaderSrc/GammaCorrection.metal
Show resolved
Hide resolved
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.
Approved from my side, pending sorting out the bracing comment from Hoikas
This PR does several things:
I'd like some feedback on the implementation in the CMake - and feedback on this change requiring CMake 3.28.