From fbff3f5ce33c594372eb23430a61059232489ffc Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Fri, 20 Jan 2023 19:16:11 +0100 Subject: [PATCH] Squashed 'deps/SPIRV-Cross/' changes from f3a75d1d4b..eb9b273298 eb9b273298 Merge pull request #2094 from LibretroAdmin/main 5029e30f0a (spirv_glsl.cpp) Fix error: no matching function for call to 'max(uint32_t&, unsigned int)' git-subtree-dir: deps/SPIRV-Cross git-subtree-split: eb9b2732982b8eea3395216be825a74dd84fe4be --- spirv_glsl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp index ef9ffde36a..08cf538183 100644 --- a/spirv_glsl.cpp +++ b/spirv_glsl.cpp @@ -1537,7 +1537,7 @@ uint32_t CompilerGLSL::type_to_packed_alignment(const SPIRType &type, const Bits // In std140, struct alignment is rounded up to 16. if (packing_is_vec4_padded(packing)) - alignment = max(alignment, 16u); + alignment = max(alignment, 16u); return alignment; } @@ -1765,7 +1765,7 @@ bool CompilerGLSL::buffer_is_packing_standard(const SPIRType &type, BufferPackin uint32_t begin_word = offset / 16; uint32_t end_word = (offset + packed_size - 1) / 16; if (begin_word != end_word) - packed_alignment = max(packed_alignment, 16u); + packed_alignment = max(packed_alignment, 16u); } uint32_t actual_offset = type_struct_member_offset(type, i);