catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Random 2024-08-19 17:45:42 +02:00 committed by GitHub
parent 9d45b99171
commit 09da94b7b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View File

@ -173,16 +173,17 @@ GraphicsPipeline::GraphicsPipeline(const Instance& instance_, Scheduler& schedul
}, },
.back{ .back{
.failOp = LiverpoolToVK::StencilOp(key.depth.backface_enable .failOp = LiverpoolToVK::StencilOp(key.depth.backface_enable
? key.stencil.stencil_fail_back ? key.stencil.stencil_fail_back.Value()
: key.stencil.stencil_fail_front), : key.stencil.stencil_fail_front.Value()),
.passOp = LiverpoolToVK::StencilOp(key.depth.backface_enable .passOp = LiverpoolToVK::StencilOp(key.depth.backface_enable
? key.stencil.stencil_zpass_back ? key.stencil.stencil_zpass_back.Value()
: key.stencil.stencil_zpass_front), : key.stencil.stencil_zpass_front.Value()),
.depthFailOp = LiverpoolToVK::StencilOp(key.depth.backface_enable .depthFailOp = LiverpoolToVK::StencilOp(key.depth.backface_enable
? key.stencil.stencil_zfail_back ? key.stencil.stencil_zfail_back.Value()
: key.stencil.stencil_zfail_front), : key.stencil.stencil_zfail_front.Value()),
.compareOp = LiverpoolToVK::CompareOp( .compareOp = LiverpoolToVK::CompareOp(key.depth.backface_enable
key.depth.backface_enable ? key.depth.stencil_bf_func : key.depth.stencil_ref_func), ? key.depth.stencil_bf_func.Value()
: key.depth.stencil_ref_func.Value()),
.compareMask = key.stencil_ref_back.stencil_mask, .compareMask = key.stencil_ref_back.stencil_mask,
.writeMask = key.stencil_ref_back.stencil_write_mask, .writeMask = key.stencil_ref_back.stencil_write_mask,
.reference = key.stencil_ref_back.stencil_test_val, .reference = key.stencil_ref_back.stencil_test_val,