Mesa (11.0): freedreno/ir3: fix 32-bit builds with pointer-to-int-cast error enabled
Emil Velikov
evelikov at kemper.freedesktop.org
Fri Jan 15 14:45:18 UTC 2016
Module: Mesa
Branch: 11.0
Commit: 34aea645d5673eb2fd2193520c06ec89db2e2733
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=34aea645d5673eb2fd2193520c06ec89db2e2733
Author: Rob Herring <robh at kernel.org>
Date: Thu Dec 17 09:42:40 2015 -0600
freedreno/ir3: fix 32-bit builds with pointer-to-int-cast error enabled
Android builds with -Werror=pointer-to-int-cast causing an error on 32-bit
builds.
Cc: "11.0 11.1" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Rob Herring <robh at kernel.org>
Signed-off-by: Rob Clark <robclark at freedesktop.org>
(cherry picked from commit b201a6ed9f6001ceaa1fc2eaf8a409b044ec97a3)
---
src/gallium/drivers/freedreno/ir3/ir3_print.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_print.c b/src/gallium/drivers/freedreno/ir3/ir3_print.c
index 07e03d2..a84e798 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_print.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_print.c
@@ -143,7 +143,7 @@ block_id(struct ir3_block *block)
#ifdef DEBUG
return block->serialno;
#else
- return (uint32_t)(uint64_t)block;
+ return (uint32_t)(unsigned long)block;
#endif
}
More information about the mesa-commit
mailing list