AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2094 from LibretroAdmin/main

Browse Source 
(spirv_glsl.cpp) Fix error: no matching function for call to 'max(uint32_t&, unsigned int)'
This commit is contained in:
Hans-Kristian Arntzen 2023-01-20 18:39:38 +01:00 committed by GitHub
commit eb9b273298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spirv_glsl.cpp
View File

@ -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. // In std140, struct alignment is rounded up to 16.
if (packing_is_vec4_padded(packing)) if (packing_is_vec4_padded(packing))
alignment = max(alignment, 16u); alignment = max<uint32_t>(alignment, 16u);
return alignment; return alignment;
} }
@ -1765,7 +1765,7 @@ bool CompilerGLSL::buffer_is_packing_standard(const SPIRType &type, BufferPackin
uint32_t begin_word = offset / 16; uint32_t begin_word = offset / 16;
uint32_t end_word = (offset + packed_size - 1) / 16; uint32_t end_word = (offset + packed_size - 1) / 16;
if (begin_word != end_word) if (begin_word != end_word)
packed_alignment = max(packed_alignment, 16u); packed_alignment = max<uint32_t>(packed_alignment, 16u);
} }
uint32_t actual_offset = type_struct_member_offset(type, i); uint32_t actual_offset = type_struct_member_offset(type, i);