summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/gallivm
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-10-23 15:54:11 -0600
committerBrian Paul <[email protected]>2012-10-26 10:59:29 -0600
commit369b5a311ca5e03bc4cccc3052800b94e316087d (patch)
treec91e9e615f28bf9a8771caef637ce5a2254cf0e0 /src/gallium/auxiliary/gallivm
parent8b63512be0c81c30e8eb31726a15777cfe869343 (diff)
gallivm/llvmpipe: fix 64-bit %ll format compiler warnings for mingw32
Use the PRIx64 and PRIu64 format macros from inttypes.h. We made a similar change in prog_print.c in df2d81ea59993a77bd1f1ef96c5cf19ac692d5f7.
Diffstat (limited to 'src/gallium/auxiliary/gallivm')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_swizzle.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
index 641c960431d..201a3487588 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
@@ -32,7 +32,7 @@
* @author Jose Fonseca <[email protected]>
*/
-
+#include <inttypes.h> /* for PRIx64 macro */
#include "util/u_debug.h"
#include "lp_bld_type.h"
@@ -386,7 +386,7 @@ lp_build_swizzle_aos(struct lp_build_context *bld,
* same shift as possible
*/
for (shift = -3; shift <= 3; ++shift) {
- unsigned long long mask = 0;
+ uint64_t mask = 0;
assert(type4.width <= sizeof(mask)*8);
@@ -401,9 +401,8 @@ lp_build_swizzle_aos(struct lp_build_context *bld,
if (mask) {
LLVMValueRef masked;
LLVMValueRef shifted;
-
if (0)
- debug_printf("shift = %i, mask = 0x%08llx\n", shift, mask);
+ debug_printf("shift = %i, mask = %" PRIx64 "\n", shift, mask);
masked = LLVMBuildAnd(builder, a,
lp_build_const_int_vec(bld->gallivm, type4, mask), "");