OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallivm/llvmpipe: fix 64-bit %ll format compiler warnings for mingw32

Browse Source 
Use the PRIx64 and PRIu64 format macros from inttypes.h.  We made a
similar change in prog_print.c in df2d81ea59.
This commit is contained in:
Brian Paul
2012-10-23 15:54:11 -06:00
parent 8b63512be0
commit 369b5a311c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
View File

@@ -32,7 +32,7 @@
* @author Jose Fonseca <jfonseca@vmware.com> * @author Jose Fonseca <jfonseca@vmware.com>
*/ */
#include <inttypes.h> /* for PRIx64 macro */
#include "util/u_debug.h" #include "util/u_debug.h"
#include "lp_bld_type.h" #include "lp_bld_type.h"
@@ -386,7 +386,7 @@ lp_build_swizzle_aos(struct lp_build_context *bld,
* same shift as possible * same shift as possible
*/ */
for (shift = -3; shift <= 3; ++shift) { for (shift = -3; shift <= 3; ++shift) {
unsigned long long mask = 0; uint64_t mask = 0;
assert(type4.width <= sizeof(mask)*8); assert(type4.width <= sizeof(mask)*8);
@@ -401,9 +401,8 @@ lp_build_swizzle_aos(struct lp_build_context *bld,
if (mask) { if (mask) {
LLVMValueRef masked; LLVMValueRef masked;
LLVMValueRef shifted; LLVMValueRef shifted;
if (0) 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, masked = LLVMBuildAnd(builder, a,
lp_build_const_int_vec(bld->gallivm, type4, mask), ""); lp_build_const_int_vec(bld->gallivm, type4, mask), "");

11
src/gallium/drivers/llvmpipe/lp_rast_debug.c
View File

@@ -1,3 +1,4 @@
#include <inttypes.h> /* for PRIu64 macro */
#include "util/u_math.h" #include "util/u_math.h"
#include "lp_rast_priv.h" #include "lp_rast_priv.h"
#include "lp_state_fs.h" #include "lp_state_fs.h"
@@ -334,8 +335,8 @@ lp_debug_draw_bins_by_coverage( struct lp_scene *scene )
unsigned x, y; unsigned x, y;
unsigned total = 0; unsigned total = 0;
unsigned possible = 0; unsigned possible = 0;
static unsigned long long _total; static uint64_t _total = 0;
static unsigned long long _possible; static uint64_t _possible = 0;
for (x = 0; x < scene->tiles_x; x++) for (x = 0; x < scene->tiles_x; x++)
debug_printf("-"); debug_printf("-");
@@ -383,10 +384,12 @@ lp_debug_draw_bins_by_coverage( struct lp_scene *scene )
_total += total; _total += total;
_possible += possible; _possible += possible;
debug_printf("overall total: %llu possible %llu: percentage: %f\n",
debug_printf("overall total: %" PRIu64
" possible %" PRIu64 ": percentage: %f\n",
_total, _total,
_possible, _possible,
_total * 100.0 / (double)_possible); (double) _total * 100.0 / (double)_possible);
} }