OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shader_enums: change VERT_BIT back to the 32-bit shift

Browse Source 
This reverts 0e2566a8. The warning is fixed differently.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10993>
This commit is contained in:
Marek Olšák
2021-05-25 16:27:30 -04:00
committed by Marge Bot
parent 45cbb08848
commit d0d2108425
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/shader_enums.h
View File

@@ -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)

2
src/mesa/main/ffvertex_prog.c
View File

@@ -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 {