summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/program/program_parse.y6
-rw-r--r--src/mesa/program/program_parser.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y
index 9fdb99db33c..4f958a99388 100644
--- a/src/mesa/program/program_parse.y
+++ b/src/mesa/program/program_parse.y
@@ -1110,7 +1110,7 @@ ATTRIB_statement: ATTRIB IDENTIFIER '=' attribBinding
YYERROR;
} else {
s->attrib_binding = $4;
- state->InputsBound |= (1U << s->attrib_binding);
+ state->InputsBound |= BITFIELD64_BIT(s->attrib_binding);
if (!validate_inputs(& @4, state)) {
YYERROR;
@@ -2403,9 +2403,9 @@ set_src_reg_swz(struct asm_src_register *r, gl_register_file file, GLint index,
int
validate_inputs(struct YYLTYPE *locp, struct asm_parser_state *state)
{
- const int inputs = state->prog->InputsRead | state->InputsBound;
+ const GLbitfield64 inputs = state->prog->InputsRead | state->InputsBound;
- if (((inputs & 0x0ffff) & (inputs >> 16)) != 0) {
+ if (((inputs & VERT_BIT_FF_ALL) & (inputs >> VERT_ATTRIB_GENERIC0)) != 0) {
yyerror(locp, state, "illegal use of generic attribute and name attribute");
return 0;
}
diff --git a/src/mesa/program/program_parser.h b/src/mesa/program/program_parser.h
index 5637598f3b3..bc756148a20 100644
--- a/src/mesa/program/program_parser.h
+++ b/src/mesa/program/program_parser.h
@@ -191,7 +191,7 @@ struct asm_parser_state {
* multiple ATTRIB statements bind illegal combinations of vertex
* attributes.
*/
- unsigned InputsBound;
+ GLbitfield64 InputsBound;
enum {
invalid_mode = 0,