diff options
| author |  ReinUsesLisp | 2021-01-24 21:41:29 -0300 |
|---|---|---|
| committer | ReinUsesLisp | 2021-01-24 21:41:29 -0300 |
| commit | 9dc4a80b178fe6448ee361bc8f8bf027154e4d0e (patch) | |
| tree | 06fe5a512f7232e604ac944eb4d2763483337532 /src | |
| parent | Merge pull request #5807 from ReinUsesLisp/vc-warnings (diff) | |
| download | yuzu-9dc4a80b178fe6448ee361bc8f8bf027154e4d0e.tar.gz yuzu-9dc4a80b178fe6448ee361bc8f8bf027154e4d0e.tar.xz yuzu-9dc4a80b178fe6448ee361bc8f8bf027154e4d0e.zip | |
vk_graphics_pipeline: Fix narrowing conversion on MSVC
Diffstat (limited to 'src')
| -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, | |||
| 327 | .rasterizerDiscardEnable = | 327 | .rasterizerDiscardEnable = |
| 328 | static_cast<VkBool32>(state.rasterize_enable == 0 ? VK_TRUE : VK_FALSE), | 328 | static_cast<VkBool32>(state.rasterize_enable == 0 ? VK_TRUE : VK_FALSE), |
| 329 | .polygonMode = VK_POLYGON_MODE_FILL, | 329 | .polygonMode = VK_POLYGON_MODE_FILL, |
| 330 | .cullMode = | 330 | .cullMode = static_cast<VkCullModeFlags>( |
| 331 | dynamic.cull_enable ? MaxwellToVK::CullFace(dynamic.CullFace()) : VK_CULL_MODE_NONE, | 331 | dynamic.cull_enable ? MaxwellToVK::CullFace(dynamic.CullFace()) : VK_CULL_MODE_NONE), |
| 332 | .frontFace = MaxwellToVK::FrontFace(dynamic.FrontFace()), | 332 | .frontFace = MaxwellToVK::FrontFace(dynamic.FrontFace()), |
| 333 | .depthBiasEnable = state.depth_bias_enable, | 333 | .depthBiasEnable = state.depth_bias_enable, |
| 334 | .depthBiasConstantFactor = 0.0f, | 334 | .depthBiasConstantFactor = 0.0f, |