diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-10-13 02:33:27 +0200 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-10-13 09:08:33 +0200 |
| commit | e4e0abc418de022903a084c9409cd502ce6c5629 (patch) | |
| tree | ec6e261a875e7c31d2f77727ed173179ef0e40e0 /src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | |
| parent | Merge pull request #4766 from ReinUsesLisp/tmml-cube (diff) | |
| download | yuzu-e4e0abc418de022903a084c9409cd502ce6c5629.tar yuzu-e4e0abc418de022903a084c9409cd502ce6c5629.tar.gz yuzu-e4e0abc418de022903a084c9409cd502ce6c5629.tar.bz2 yuzu-e4e0abc418de022903a084c9409cd502ce6c5629.tar.lz yuzu-e4e0abc418de022903a084c9409cd502ce6c5629.tar.xz yuzu-e4e0abc418de022903a084c9409cd502ce6c5629.tar.zst yuzu-e4e0abc418de022903a084c9409cd502ce6c5629.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index a4b9e7ef5..696eaeb5f 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -261,12 +261,12 @@ vk::Pipeline VKGraphicsPipeline::CreatePipeline(const RenderPassParams& renderpa vertex_input_ci.pNext = &input_divisor_ci; } - const auto input_assembly_topology = MaxwellToVK::PrimitiveTopology(device, dynamic.Topology()); + const auto input_assembly_topology = MaxwellToVK::PrimitiveTopology(device, state.topology); const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, - .topology = MaxwellToVK::PrimitiveTopology(device, dynamic.Topology()), + .topology = MaxwellToVK::PrimitiveTopology(device, state.topology), .primitiveRestartEnable = state.primitive_restart_enable != 0 && SupportsPrimitiveRestart(input_assembly_topology), }; @@ -400,7 +400,6 @@ vk::Pipeline VKGraphicsPipeline::CreatePipeline(const RenderPassParams& renderpa static constexpr std::array extended{ VK_DYNAMIC_STATE_CULL_MODE_EXT, VK_DYNAMIC_STATE_FRONT_FACE_EXT, - VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT, VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT, VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT, VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT, |