Browse Source

Merge pull request #5819 from ReinUsesLisp/cull-mode-cast

vk_graphics_pipeline: Fix narrowing conversion on MSVC
nce_cpp
bunnei 5 years ago
committed by GitHub
parent
commit
3bf4a6415f
  1. 4
      src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp

4
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,

Loading…
Cancel
Save