[Mesa-dev] [PATCH] gallium: use "ull" number suffix to keep the QtCreator parser happy

Eric Engestrom eric.engestrom at imgtec.com
Mon Jul 10 09:43:25 UTC 2017


On Saturday, 2017-07-08 23:59:25 +0200, Thomas Helland wrote:
> Yes please!
> I find this much more intuitive, as a bonus =)
> 
> Reviewed-by: Thomas Helland <thomashelland90 at gmail.com>
> 

Agreed, r-b as well:
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

You missed a couple though, feel free to squash this with your commit:

----8<----
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 6992da16d5..1893d4c4a5 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -342,7 +342,7 @@ struct __DRI2throttleExtensionRec {
 #define __DRI2_FENCE "DRI2_Fence"
 #define __DRI2_FENCE_VERSION 2
 
-#define __DRI2_FENCE_TIMEOUT_INFINITE     0xffffffffffffffffllu
+#define __DRI2_FENCE_TIMEOUT_INFINITE     0xffffffffffffffffull
 
 #define __DRI2_FENCE_FLAG_FLUSH_COMMANDS  (1 << 0)
 
diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c
index e737519eef..5e461b970b 100644
--- a/src/gallium/drivers/radeonsi/si_cp_dma.c
+++ b/src/gallium/drivers/radeonsi/si_cp_dma.c
@@ -215,7 +215,7 @@ static void si_clear_buffer(struct pipe_context *ctx, struct pipe_resource *dst,
 	if (!size)
 		return;
 
-	dma_clear_size = size & ~3llu;
+	dma_clear_size = size & ~3ull;
 
 	/* Mark the buffer range of destination as valid (initialized),
 	 * so that transfer_map knows it should wait for the GPU when mapping
diff --git a/src/util/bitscan.h b/src/util/bitscan.h
index 7a605e0370..611e812059 100644
--- a/src/util/bitscan.h
+++ b/src/util/bitscan.h
@@ -136,7 +136,7 @@ u_bit_scan_consecutive_range(unsigned *mask, int *start, int *count)
 static inline void
 u_bit_scan_consecutive_range64(uint64_t *mask, int *start, int *count)
 {
-   if (*mask == ~0llu) {
+   if (*mask == ~0ull) {
       *start = 0;
       *count = 64;
       *mask = 0;
---->8----


More information about the mesa-dev mailing list