From 09da94b7b28a64c17a229324bc9a87aac5964b16 Mon Sep 17 00:00:00 2001 From: Random <28494085+Random06457@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:45:42 +0200 Subject: [PATCH] fix gcc compilation error in vk_graphics_pipeline.cpp (#477) gcc fails to infer the type of the two parts of a ternary expression whose types are different but both contain an implicit cast operator to the same type --- .../renderer_vulkan/vk_graphics_pipeline.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 2d502737..04486290 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -173,16 +173,17 @@ GraphicsPipeline::GraphicsPipeline(const Instance& instance_, Scheduler& schedul }, .back{ .failOp = LiverpoolToVK::StencilOp(key.depth.backface_enable - ? key.stencil.stencil_fail_back - : key.stencil.stencil_fail_front), + ? key.stencil.stencil_fail_back.Value() + : key.stencil.stencil_fail_front.Value()), .passOp = LiverpoolToVK::StencilOp(key.depth.backface_enable - ? key.stencil.stencil_zpass_back - : key.stencil.stencil_zpass_front), + ? key.stencil.stencil_zpass_back.Value() + : key.stencil.stencil_zpass_front.Value()), .depthFailOp = LiverpoolToVK::StencilOp(key.depth.backface_enable - ? key.stencil.stencil_zfail_back - : key.stencil.stencil_zfail_front), - .compareOp = LiverpoolToVK::CompareOp( - key.depth.backface_enable ? key.depth.stencil_bf_func : key.depth.stencil_ref_func), + ? key.stencil.stencil_zfail_back.Value() + : key.stencil.stencil_zfail_front.Value()), + .compareOp = LiverpoolToVK::CompareOp(key.depth.backface_enable + ? key.depth.stencil_bf_func.Value() + : key.depth.stencil_ref_func.Value()), .compareMask = key.stencil_ref_back.stencil_mask, .writeMask = key.stencil_ref_back.stencil_write_mask, .reference = key.stencil_ref_back.stencil_test_val,