diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 07:42:31 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 07:42:31 +0100 |
| commit | 528f5bd58a139174170c4130c67dca30193c9057 (patch) | |
| tree | 550c818095dbc607deaddf166c77116ccd91ef54 /mesalib/src/mesa/program/program_parse.y | |
| parent | 2cfebffb491807a465a8e5f7daca582d8aefb829 (diff) | |
| download | vcxsrv-528f5bd58a139174170c4130c67dca30193c9057.tar.gz vcxsrv-528f5bd58a139174170c4130c67dca30193c9057.tar.bz2 vcxsrv-528f5bd58a139174170c4130c67dca30193c9057.zip | |
xserver xkeyboard-config mesa git update 5 dec 2011
Diffstat (limited to 'mesalib/src/mesa/program/program_parse.y')
| -rw-r--r-- | mesalib/src/mesa/program/program_parse.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/program/program_parse.y b/mesalib/src/mesa/program/program_parse.y index 9fdb99db3..4f958a993 100644 --- a/mesalib/src/mesa/program/program_parse.y +++ b/mesalib/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; } |