-
Notifications
You must be signed in to change notification settings - Fork 435
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
WIP: Transform feedback #1943
Draft
gpx1000
wants to merge
60
commits into
KhronosGroup:main
Choose a base branch
from
gpx1000:transform_feedback_public
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.
Draft
WIP: Transform feedback #1943
Changes from 59 commits
Commits
Show all changes
60 commits
Select commit
Hold shift + click to select a range
301d384
Advertise the VK_EXT_shader_demote_to_helper_invocation extension.
cdavis5e d010c61
Work around problems with explicit LoD with arrayed depth images on A…
cdavis5e 0e5e28a
Merged in sample-dref-lod-array-workaround (pull request #5)
cdavis5e 1c5cc7a
add in CMake build capability
gpx1000 ac64308
Advertise the VK_EXT_shader_demote_to_helper_invocation extension.
cdavis5e 8aa8bfc
Merged in shader-demote-to-helper (pull request #6)
cdavis5e 11aba7b
Transform Feedback initial implementation.
gpx1000 c00d168
Merge branch 'transform_feedback'
gpx1000 8450aa6
not sure how the merge commit didn't make it in.
gpx1000 56fa3b5
Merge remote-tracking branch 'origin/master'
gpx1000 dcd5873
Merge branch 'master' into transform_feedback
gpx1000 07bd3b0
make CMake work for all build types and fix the merge conflicts by up…
gpx1000 48c2a9c
1.) remove Query path as it is optional. We might add it in at a lat…
gpx1000 482c19a
put the counter buffers into the current graphics resources state.
gpx1000 c262cc4
address rest of comments.
gpx1000 39a9082
move buffers and try to write to them.
gpx1000 df3cd19
fix building
gpx1000 2489c0c
Add methods to map transform feedback bindings to Metal bindings.
cdavis5e f935aff
Working together with Chip
gpx1000 942b5bf
Working together with Chip
gpx1000 4cf27c6
update SPIRV-Cross_repo_revision to point at the right PR location.
gpx1000 bb1ddf6
Merge branch 'transform_feedback' into transform_feedback_public
gpx1000 8d131f2
Update SPIRV-Cross_repo_revision
gpx1000 17f5dc5
fix the build after merge conflicts
gpx1000 a7771ab
Merge remote-tracking branch 'upstream/transform_feedback_public' int…
gpx1000 2d7cc1f
Merge branch 'main' into transform_feedback_public
gpx1000 50830de
revert spriv-cross revision number
gpx1000 af071d3
Merge remote-tracking branch 'upstream/transform_feedback_public' int…
gpx1000 fc3c263
mystery merge error fix
gpx1000 6a8858c
Merge branch 'master' into transform_feedback
cdavis5e b5bcb0f
Add missing handling of `VK_EXT_transform_feedback` nuts and bolts.
cdavis5e 01d6c1c
Remove extraneous `if`-branch.
cdavis5e 244afc6
Merge remote-tracking branch 'origin/main' into transform_feedback
cdavis5e 1bbfd3e
Checkpoint for transform feedback support.
cdavis5e c4977ad
Merge remote-tracking branch 'steve/transform_feedback_public' into t…
cdavis5e 8c428a6
Really preliminary checkpoint for pass-through vertex shader support.
cdavis5e 7f21588
Ridiculously small checkpoint with very little to show for it.
cdavis5e d112c8d
Grab outputs from the vertex shader in preparation for generating the…
cdavis5e 2ed6387
Add bare-bones method to emit the pass-through vertex shader.
cdavis5e 250a9a2
Incomplete checkpoint for getting XFB buffer indices and offsets from…
cdavis5e 804fd9f
Add a little bit more reflection data for transform feedback.
cdavis5e 92ea5ca
Add buffer parameters to the passthrough shader.
cdavis5e 1f085a0
Generate the passthrough stage output structure.
cdavis5e 5ccf045
Emit loads and stores in the passthrough vertex shader.
cdavis5e 38c6533
Sort vertex shader outputs.
cdavis5e 9422cbc
Emit the buffer structs.
cdavis5e 3daf3f5
Return the XFB buffer stride.
cdavis5e d46b781
Emit padding for the buffer stride.
cdavis5e 9976745
Remove redundant helper.
cdavis5e a4a7ac9
Handle clip/cull distances properly.
cdavis5e 0e6d694
Also emit clip distance array to the rasterizer.
cdavis5e 8fc4f2a
Recurisvely handle structure types in vertex input for XFB.
cdavis5e 7eb2da8
Add the pass-through shader to the raster pipeline.
cdavis5e c6e3d88
Don't try to create a rasterization pipeline if we're not rasterizing.
cdavis5e c0581f4
Reserve buffer slots for the transform feedback buffers.
cdavis5e 0fb9f33
Merge remote-tracking branch 'origin' into transform_feedback
cdavis5e 159ee5f
Update some references to tessellation vertex shaders for XFB.
cdavis5e ba12429
Use the preexisting method on `MVKDevice` to get the XFB binding numb…
cdavis5e b604f13
Fix broken build.
cdavis5e be3a4b3
remove CMakeLists.txt from Transform Feedback PR.
gpx1000 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| cmake_minimum_required(VERSION 3.25) | ||
| project(MoltenVK) | ||
|
|
||
| set(MVK_GIT_REV "unknown") | ||
|
|
||
| find_package(Git) | ||
| if(GIT_FOUND) | ||
| execute_process( | ||
| COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD | ||
| OUTPUT_VARIABLE MVK_GIT_REV | ||
| ERROR_QUIET | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE | ||
| ) | ||
| message( STATUS "GIT hash: ${MVK_GIT_REV}") | ||
| else() | ||
| message(STATUS "GIT not found") | ||
| endif() | ||
|
|
||
| configure_file(${CMAKE_CURRENT_LIST_DIR}/mvkGitRevDerived.h.in | ||
| ${CMAKE_CURRENT_BINARY_DIR}/mvkGitRevDerived.h) | ||
|
|
||
| add_subdirectory(External) | ||
| add_subdirectory(MoltenVKShaderConverter) | ||
| add_subdirectory(MoltenVK) | ||
|
|
||
| target_include_directories(MoltenVK-iOS PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) | ||
| target_include_directories(MoltenVK-tvOS PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) | ||
| target_include_directories(MoltenVK-macOS PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) | ||
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 |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| set(SKIP_PORTABILITY_TEST ON) | ||
| set(JUST_INSTALL_CEREAL ON) | ||
|
|
||
| add_subdirectory(cereal) | ||
| add_subdirectory(glslang) | ||
| set(SPIRV_TOOLS_BUILD_STATIC ON) | ||
| add_subdirectory(SPIRV-Cross) | ||
| add_subdirectory(Vulkan-Headers) |
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| 4818f7e7ef7b7078a3a7a5a52c4a338e0dda22f4 | ||
| 15a8b709ffb9f941ed7fc48013bc7deda5659275 |
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 |
|---|---|---|
| @@ -0,0 +1,204 @@ | ||
|
|
||
|
|
||
| ## | ||
| ## MoltenVK-iOS Files | ||
| ## | ||
|
|
||
| set(MOLTEN_VK_PROJECT_HEADERS | ||
| ${CMAKE_CURRENT_LIST_DIR}/../Common/MVKCommonEnvironment.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/../Common/MVKOSExtensions.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/../Common/MVKStrings.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/API/mvk_datatypes.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/API/mvk_vulkan.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/API/vk_mvk_moltenvk.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdDebug.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdDraw.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdPipeline.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdQueries.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdRenderPass.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdTransfer.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommand.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandBuffer.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandEncoderState.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandEncodingPool.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandPipelineStateFactoryShaderSource.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandPool.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandResourceFactory.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKMTLBufferAllocation.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKMTLResourceBindings.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKBuffer.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKDescriptor.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKDescriptorSet.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKDevice.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKDeviceFeatureStructs.def | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKDeviceMemory.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKFramebuffer.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKImage.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKInstance.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKPipeline.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKPixelFormats.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKQueryPool.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKQueue.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKRenderPass.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKResource.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKShaderModule.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKSurface.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKSwapchain.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKSync.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKVulkanAPIObject.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Layers/MVKExtensions.def | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Layers/MVKExtensions.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Layers/MVKLayers.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/CAMetalLayer+MoltenVK.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLRenderPassDepthAttachmentDescriptor+MoltenVK.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLRenderPassDescriptor+MoltenVK.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLRenderPassStencilAttachmentDescriptor+MoltenVK.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLRenderPipelineDescriptor+MoltenVK.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLSamplerDescriptor+MoltenVK.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLTextureDescriptor+MoltenVK.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MVKGPUCapture.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/NSString+MoltenVK.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKBaseObject.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKBitArray.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKBlockObserver.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKCodec.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKEnvironment.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKFoundation.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKLogging.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKObjectPool.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKSmallVector.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKSmallVectorAllocator.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKWatermark.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKWatermarkShaderSource.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKWatermarkTextureContent.h | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Vulkan/mvk_datatypes.hpp | ||
| ) | ||
|
|
||
| set(MOLTEN_VK_SOURCES | ||
| ${CMAKE_CURRENT_LIST_DIR}/../Common/MVKOSExtensions.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdDebug.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdDispatch.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdDraw.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdPipeline.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdQueries.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdRenderPass.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdTransfer.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandBuffer.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandEncoderState.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandEncodingPool.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandPool.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCommandResourceFactory.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKMTLBufferAllocation.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKBuffer.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKDescriptor.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKDescriptorSet.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKDevice.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKDeviceMemory.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKFramebuffer.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKImage.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKInstance.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKPipeline.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKPixelFormats.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKQueryPool.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKQueue.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKRenderPass.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKResource.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKShaderModule.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKSurface.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKSwapchain.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKSync.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects/MVKVulkanAPIObject.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Layers/MVKExtensions.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Layers/MVKLayers.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/CAMetalLayer+MoltenVK.m | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLRenderPassDepthAttachmentDescriptor+MoltenVK.m | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLRenderPassDescriptor+MoltenVK.m | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLRenderPassStencilAttachmentDescriptor+MoltenVK.m | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLRenderPipelineDescriptor+MoltenVK.m | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLSamplerDescriptor+MoltenVK.m | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MTLTextureDescriptor+MoltenVK.m | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/MVKGPUCapture.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/NSString+MoltenVK.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKBaseObject.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKBlockObserver.m | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKCodec.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKEnvironment.cpp | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKFoundation.cpp | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility/MVKWatermark.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Vulkan/mvk_datatypes.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Vulkan/mvk_api.mm | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Vulkan/vulkan.mm | ||
| ) | ||
|
|
||
| ## | ||
| ## MoltenVK-iOS | ||
| ## | ||
|
|
||
| add_library(MoltenVK-iOS STATIC | ||
| ${MOLTEN_VK_SOURCES} | ||
| ) | ||
|
|
||
| target_include_directories(MoltenVK-iOS | ||
| PUBLIC | ||
| ${CMAKE_CURRENT_LIST_DIR}/../Common | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/API | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Layers | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Vulkan | ||
| ${CMAKE_CURRENT_LIST_DIR}/include | ||
| ) | ||
|
|
||
| target_compile_features(MoltenVK-iOS PRIVATE cxx_std_17) | ||
| target_link_libraries(MoltenVK-iOS PUBLIC moltenvk_shader_converter) | ||
|
|
||
| ## | ||
| ## MoltenVK-tvOS | ||
| ## | ||
|
|
||
| add_library(MoltenVK-tvOS STATIC | ||
| ${MOLTEN_VK_SOURCES} | ||
| ) | ||
|
|
||
| target_include_directories(MoltenVK-tvOS | ||
| PUBLIC | ||
| ${CMAKE_CURRENT_LIST_DIR}/../Common | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/API | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Layers | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Vulkan | ||
| ${CMAKE_CURRENT_LIST_DIR}/include | ||
| ) | ||
|
|
||
| target_compile_features(MoltenVK-tvOS PRIVATE cxx_std_17) | ||
| target_link_libraries(MoltenVK-tvOS PUBLIC moltenvk_shader_converter) | ||
|
|
||
|
|
||
| ## | ||
| ## MoltenVK-macOS | ||
| ## | ||
|
|
||
| add_executable(MoltenVK-macOS | ||
| ${MOLTEN_VK_SOURCES} | ||
| ) | ||
|
|
||
| target_include_directories(MoltenVK-macOS | ||
| PUBLIC | ||
| ${CMAKE_CURRENT_LIST_DIR}/../Common | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/API | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/GPUObjects | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Layers | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Utility | ||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Vulkan | ||
| ${CMAKE_CURRENT_LIST_DIR}/include | ||
| ) | ||
|
|
||
| target_compile_features(MoltenVK-macOS PRIVATE cxx_std_17) | ||
| target_link_libraries(MoltenVK-macOS PUBLIC moltenvk_shader_converter) |
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
Oops, something went wrong.
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.
IMO, the CMake changes should be kept in only #1947, it's out of scope for this PR.
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.
Yep; fully agree. Thanks for the feedback!