From d0d2108425409defa25a13cb519a0ab7604a3bcb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 25 May 2021 16:27:30 -0400 Subject: [PATCH] shader_enums: change VERT_BIT back to the 32-bit shift This reverts 0e2566a8. The warning is fixed differently. Reviewed-by: Jesse Natalie Part-of: --- src/compiler/shader_enums.h | 2 +- src/mesa/main/ffvertex_prog.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index 2728c44..0bb722d 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -240,7 +240,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) BITFIELD64_BIT(i) +#define VERT_BIT(i) BITFIELD_BIT(i) #define VERT_BIT_ALL BITFIELD_RANGE(0, VERT_ATTRIB_MAX) #define VERT_BIT_FF(i) VERT_BIT(i) diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index ff5cf23..f38c6a3 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -439,7 +439,7 @@ static struct ureg register_input( struct tnl_program *p, GLuint input ) assert(input < VERT_ATTRIB_MAX); if (p->state->varying_vp_inputs & VERT_BIT(input)) { - p->program->info.inputs_read |= VERT_BIT(input); + p->program->info.inputs_read |= (uint64_t)VERT_BIT(input); return make_ureg(PROGRAM_INPUT, input); } else { -- 2.7.4