Browse Source
Merge pull request #5819 from ReinUsesLisp/cull-mode-cast
vk_graphics_pipeline: Fix narrowing conversion on MSVC
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
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, |
|
|
|
|
