diff options
| author | bunnei <bunneidev@gmail.com> | 2021-01-25 01:58:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 01:58:38 +0100 |
| commit | 45e117b0436f97b926031ef19820573a4768913d (patch) | |
| tree | 06fe5a512f7232e604ac944eb4d2763483337532 | |
| parent | Merge pull request #5807 from ReinUsesLisp/vc-warnings (diff) | |
| parent | vk_graphics_pipeline: Fix narrowing conversion on MSVC (diff) | |
| download | yuzu-45e117b0436f97b926031ef19820573a4768913d.tar yuzu-45e117b0436f97b926031ef19820573a4768913d.tar.gz yuzu-45e117b0436f97b926031ef19820573a4768913d.tar.bz2 yuzu-45e117b0436f97b926031ef19820573a4768913d.tar.lz yuzu-45e117b0436f97b926031ef19820573a4768913d.tar.xz yuzu-45e117b0436f97b926031ef19820573a4768913d.tar.zst yuzu-45e117b0436f97b926031ef19820573a4768913d.zip | |
| -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 485cb43f2..d50dca604 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -327,8 +327,8 @@ vk::Pipeline VKGraphicsPipeline::CreatePipeline(const SPIRVProgram& program, .rasterizerDiscardEnable = static_cast<VkBool32>(state.rasterize_enable == 0 ? VK_TRUE : VK_FALSE), .polygonMode = VK_POLYGON_MODE_FILL, - .cullMode = - dynamic.cull_enable ? MaxwellToVK::CullFace(dynamic.CullFace()) : VK_CULL_MODE_NONE, + .cullMode = static_cast<VkCullModeFlags>( + dynamic.cull_enable ? MaxwellToVK::CullFace(dynamic.CullFace()) : VK_CULL_MODE_NONE), .frontFace = MaxwellToVK::FrontFace(dynamic.FrontFace()), .depthBiasEnable = state.depth_bias_enable, .depthBiasConstantFactor = 0.0f, |