diff options
| author | 2021-12-18 05:47:48 +0100 | |
|---|---|---|
| committer | 2021-12-18 05:47:48 +0100 | |
| commit | 6430fc29a910d0d30db1ce6aaa05bf776b112623 (patch) | |
| tree | 0645e9bd45b4d9ee53ab954cd995becebed05f9b /src/video_core/renderer_vulkan | |
| parent | Merge pull request #7532 from goldenx86/patch-3 (diff) | |
| download | yuzu-6430fc29a910d0d30db1ce6aaa05bf776b112623.tar.gz yuzu-6430fc29a910d0d30db1ce6aaa05bf776b112623.tar.xz yuzu-6430fc29a910d0d30db1ce6aaa05bf776b112623.zip | |
Vulkan: Implement VK_EXT_primitive_topology_list_restart
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 616a7b457..0c175c557 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | |||
| @@ -605,7 +605,8 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { | |||
| 605 | .flags = 0, | 605 | .flags = 0, |
| 606 | .topology = input_assembly_topology, | 606 | .topology = input_assembly_topology, |
| 607 | .primitiveRestartEnable = key.state.primitive_restart_enable != 0 && | 607 | .primitiveRestartEnable = key.state.primitive_restart_enable != 0 && |
| 608 | SupportsPrimitiveRestart(input_assembly_topology), | 608 | (device.IsExtPrimitiveTopologyListRestartSupported() || |
| 609 | SupportsPrimitiveRestart(input_assembly_topology)), | ||
| 609 | }; | 610 | }; |
| 610 | const VkPipelineTessellationStateCreateInfo tessellation_ci{ | 611 | const VkPipelineTessellationStateCreateInfo tessellation_ci{ |
| 611 | .sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO, | 612 | .sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO, |
| @@ -613,7 +614,6 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { | |||
| 613 | .flags = 0, | 614 | .flags = 0, |
| 614 | .patchControlPoints = key.state.patch_control_points_minus_one.Value() + 1, | 615 | .patchControlPoints = key.state.patch_control_points_minus_one.Value() + 1, |
| 615 | }; | 616 | }; |
| 616 | |||
| 617 | std::array<VkViewportSwizzleNV, Maxwell::NumViewports> swizzles; | 617 | std::array<VkViewportSwizzleNV, Maxwell::NumViewports> swizzles; |
| 618 | std::ranges::transform(key.state.viewport_swizzles, swizzles.begin(), UnpackViewportSwizzle); | 618 | std::ranges::transform(key.state.viewport_swizzles, swizzles.begin(), UnpackViewportSwizzle); |
| 619 | const VkPipelineViewportSwizzleStateCreateInfoNV swizzle_ci{ | 619 | const VkPipelineViewportSwizzleStateCreateInfoNV swizzle_ci{ |