mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squashed 'deps/SPIRV-Cross/' changes from f3a75d1d4b..eb9b273298

Browse Source 
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
This commit is contained in:
libretroadmin 2023-01-20 19:16:11 +01:00
parent da29639d70
commit fbff3f5ce3
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.
if (packing_is_vec4_padded(packing))
alignment = max(alignment, 16u);
alignment = max<uint32_t>(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<uint32_t>(packed_alignment, 16u);
}
uint32_t actual_offset = type_struct_member_offset(type, i);