From 70687cdbe62a16da150713dd05a54c4ca7f3a7cf Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Mon, 19 Apr 2021 11:52:12 -0700 Subject: [PATCH] shader_enums: Fix MSVC warning C4334 (32bit shift cast to 64bit) The warning is triggered when assigning into inputs_read, which is 64bit. Reviewed-by: Jason Ekstrand Reviewed-By: Bill Kristiansen Cc: mesa-stable@lists.freedesktop.org Part-of: (cherry picked from commit 0e2566a8a7e327b21087e7889d8e8028a5cc5edd) --- .pick_status.json | 2 +- src/compiler/shader_enums.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 353002547d5..f12eb1b8b1f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -400,7 +400,7 @@ "description": "shader_enums: Fix MSVC warning C4334 (32bit shift cast to 64bit)", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index 8883e8d2aa7..7522bdbd77c 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -231,7 +231,7 @@ const char *gl_vert_attrib_name(gl_vert_attrib attrib); #define VERT_BIT_POINT_SIZE BITFIELD_BIT(VERT_ATTRIB_POINT_SIZE) #define VERT_BIT_GENERIC0 BITFIELD_BIT(VERT_ATTRIB_GENERIC0) -#define VERT_BIT(i) BITFIELD_BIT(i) +#define VERT_BIT(i) BITFIELD64_BIT(i) #define VERT_BIT_ALL BITFIELD_RANGE(0, VERT_ATTRIB_MAX) #define VERT_BIT_FF(i) VERT_BIT(i)