Mesa (master): mesa: Use typecast in BITFIELD64_BIT macro.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Mar 16 09:16:14 UTC 2011
Module: Mesa
Branch: master
Commit: 5fc5820cbc0faf57a48154466b4792294841a690
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fc5820cbc0faf57a48154466b4792294841a690
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed Mar 16 09:15:30 2011 +0000
mesa: Use typecast in BITFIELD64_BIT macro.
Unsigned long is 32bit on several platforms (e.g., Windows), yielding
1UL << 32 to be zero.
Note that BITFIELD64_BIT result is often assigned to variables of type
GLbitfield, instead of GLbitfield64. That's probably wrong and should be
addressed in a later change.
---
src/mesa/main/mtypes.h | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 95a7988..831774f 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -85,11 +85,7 @@
typedef GLuint64 GLbitfield64;
/** Set a single bit */
-#ifdef __cplusplus
-#define BITFIELD64_BIT(b) (1UL << (b))
-#else
-#define BITFIELD64_BIT(b) (1ULL << (b))
-#endif
+#define BITFIELD64_BIT(b) ((GLbitfield64)1 << (b))
/**
More information about the mesa-commit
mailing list