Add Mesh Shader Support to Vulkan#1177
Merged
manon-traverse merged 3 commits intoMay 28, 2026
Merged
Conversation
1bde8ec to
4c8b57e
Compare
EmilioLaiso
approved these changes
May 27, 2026
4c8b57e to
c91f376
Compare
MarijnS95
reviewed
May 28, 2026
Comment on lines
600
to
+602
| PFN_vkCmdBeginDebugUtilsLabelEXT CmdBeginDebugUtilsLabel, | ||
| PFN_vkCmdEndDebugUtilsLabelEXT CmdEndDebugUtilsLabel, | ||
| PFN_vkCmdInsertDebugUtilsLabelEXT CmdInsertDebugUtilsLabel) { | ||
| PFN_vkCmdInsertDebugUtilsLabelEXT CmdInsertDebugUtilsLabel, |
Collaborator
There was a problem hiding this comment.
Should we design a DebugFunctions struct for these too (in a separate PR)?
And do you recommend me to follow the same pattern in #1232?
| PipelineCI.renderPass = RenderPassHandle; | ||
|
|
||
| VkPipeline Pipeline = VK_NULL_HANDLE; | ||
| if (auto Err = VK::toError(vkCreateGraphicsPipelines(Device, VK_NULL_HANDLE, |
Collaborator
There was a problem hiding this comment.
Curious: did we previously factor out a helper for all the duplicate VkGraphicsPipelineCreateInfo state, that is the same for every graphics pipeline?
Contributor
Author
There was a problem hiding this comment.
I don't think we did?
c91f376 to
bf6708d
Compare
3 tasks
MarijnS95
approved these changes
May 28, 2026
e00683c to
44e070e
Compare
Contributor
Author
|
CI only fails on test irrelevant to this PR, so I feel safe to merge this. |
alsepkow
added a commit
to alsepkow/offload-test-suite
that referenced
this pull request
May 28, 2026
Two local variables both named `EnabledDeviceExtensions` were declared in the same enclosing scope of `VulkanDevice::create`: one added by llvm#1177 (mesh shader) and one added inside `#ifdef VK_EXT_SHADER_IMAGE_ATOMIC_INT64_EXTENSION_NAME` by llvm#1195 (InterlockedOr). On platforms where the Vulkan SDK defines that macro (e.g. the macOS runner with Vulkan 1.4.335), clang rejects the file with `error: redefinition of 'EnabledDeviceExtensions' with a different type`. Beyond the build break, the inner block also overwrote `DeviceInfo.enabledExtensionCount` and `ppEnabledExtensionNames` that the mesh-shader block had populated, silently dropping `VK_EXT_mesh_shader` whenever both extensions were available. Append the AtomicInt64 extension to the single `EnabledDeviceExtensions` vector and assign the `DeviceInfo` extension fields once, after both blocks. Assisted-by: Claude Opus 4.7 (claude-opus-4.7-high) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
alsepkow
added a commit
to alsepkow/offload-test-suite
that referenced
this pull request
May 28, 2026
Two local variables both named `EnabledDeviceExtensions` were declared in the same enclosing scope of `VulkanDevice::create`: one added by llvm#1177 (mesh shader) and one added inside `#ifdef VK_EXT_SHADER_IMAGE_ATOMIC_INT64_EXTENSION_NAME` by llvm#1195 (InterlockedOr). Any platform whose Vulkan SDK defines that macro rejects the file. CI surfaced it first on the macOS runner (Vulkan 1.4.335 + clang) because that job ran ahead of the Windows jobs and short-circuited the matrix, but Windows is equally affected: Windows VK CI uses Vulkan SDK 1.4.350.0, and a local Windows + MSVC + Vulkan SDK 1.4.341.1 build reproduces the failure as `error C2371: 'EnabledDeviceExtensions': redefinition`. Beyond the build break, the inner block also overwrote `DeviceInfo.enabledExtensionCount` and `ppEnabledExtensionNames` that the mesh-shader block had populated, silently dropping `VK_EXT_mesh_shader` whenever both extensions were available. Neither bug existed in either PR in isolation; both are post-merge artifacts. Append the AtomicInt64 extension to the single `EnabledDeviceExtensions` vector and assign the `DeviceInfo` extension fields once, after both blocks. Assisted-by: Claude Opus 4.7 (claude-opus-4.7-high) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or 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
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.
Add Mesh Shader support to Vulkan.
Graphics/MeshShaders/SimpleTriangle.test now passes on Vulkan.