diff options
| author |  bunnei | 2020-07-16 18:49:42 -0400 |
|---|---|---|
| committer |  GitHub | 2020-07-16 18:49:42 -0400 |
| commit | 267d483ed4ea9d2c8e7ea03ff5831f885c3c9f95 (patch) | |
| tree | cec1dfa9f9b837669558d16e4d503c18d4d7c1d2 | |
| parent | Merge pull request #4327 from lioncash/desig2 (diff) | |
| parent | vk_graphics_pipeline: Resolve narrowing warnings (diff) | |
| download | yuzu-267d483ed4ea9d2c8e7ea03ff5831f885c3c9f95.tar.gz yuzu-267d483ed4ea9d2c8e7ea03ff5831f885c3c9f95.tar.xz yuzu-267d483ed4ea9d2c8e7ea03ff5831f885c3c9f95.zip | |
Merge pull request #4362 from lioncash/cast
vk_graphics_pipeline: Resolve narrowing warnings
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 6 |
1 files changed, 4 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 2cc3c1c1a..aaf930b90 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | |||
| @@ -307,8 +307,10 @@ vk::Pipeline VKGraphicsPipeline::CreatePipeline(const RenderPassParams& renderpa | |||
| 307 | .sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, | 307 | .sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, |
| 308 | .pNext = nullptr, | 308 | .pNext = nullptr, |
| 309 | .flags = 0, | 309 | .flags = 0, |
| 310 | .depthClampEnable = state.depth_clamp_disabled == 0 ? VK_TRUE : VK_FALSE, | 310 | .depthClampEnable = |
| 311 | .rasterizerDiscardEnable = state.rasterize_enable == 0 ? VK_TRUE : VK_FALSE, | 311 | static_cast<VkBool32>(state.depth_clamp_disabled == 0 ? VK_TRUE : VK_FALSE), |
| 312 | .rasterizerDiscardEnable = | ||
| 313 | static_cast<VkBool32>(state.rasterize_enable == 0 ? VK_TRUE : VK_FALSE), | ||
| 312 | .polygonMode = VK_POLYGON_MODE_FILL, | 314 | .polygonMode = VK_POLYGON_MODE_FILL, |
| 313 | .cullMode = | 315 | .cullMode = |
| 314 | dynamic.cull_enable ? MaxwellToVK::CullFace(dynamic.CullFace()) : VK_CULL_MODE_NONE, | 316 | dynamic.cull_enable ? MaxwellToVK::CullFace(dynamic.CullFace()) : VK_CULL_MODE_NONE, |