(SPIRV-Cross) Buildfix

This commit is contained in:
twinaphex 2019-07-27 03:44:32 +02:00
parent b4ec860bb3
commit bcdc759b3e

View File

@ -1090,10 +1090,10 @@ 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))
#ifdef RARCH_INTERNAL #if defined(RARCH_INTERNAL)
alignment = MAX(*alignment, 16u); alignment = MAX(alignment, 16u);
#else #else
alignment = max(*alignment, 16u); alignment = max(alignment, 16u);
#endif #endif
return alignment; return alignment;
@ -1318,7 +1318,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)
#ifdef RARCH_INTERNAL #if defined(RARCH_INTERNAL)
packed_alignment = MAX(packed_alignment, 16u); packed_alignment = MAX(packed_alignment, 16u);
#else #else
packed_alignment = max(packed_alignment, 16u); packed_alignment = max(packed_alignment, 16u);