diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-29 12:25:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-29 12:25:28 +0100 |
| commit | 2cfebffb491807a465a8e5f7daca582d8aefb829 (patch) | |
| tree | 1e17cf480a441bc4b941008005fcd0cc6c3d09a6 /mesalib/src/mesa/program | |
| parent | 7417e9a171736b5279881cd4381fb58c617a23d9 (diff) | |
| download | vcxsrv-2cfebffb491807a465a8e5f7daca582d8aefb829.tar.gz vcxsrv-2cfebffb491807a465a8e5f7daca582d8aefb829.tar.bz2 vcxsrv-2cfebffb491807a465a8e5f7daca582d8aefb829.zip | |
mesa git update 29 nov 2011
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/program_parse.y | 6 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/programopt.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mesa/program/program_parse.y b/mesalib/src/mesa/program/program_parse.y index dec35038b..9fdb99db3 100644 --- a/mesalib/src/mesa/program/program_parse.y +++ b/mesalib/src/mesa/program/program_parse.y @@ -802,7 +802,7 @@ srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */ break; case at_attrib: set_src_reg(& $$, PROGRAM_INPUT, s->attrib_binding); - state->prog->InputsRead |= (1U << $$.Base.Index); + state->prog->InputsRead |= BITFIELD64_BIT($$.Base.Index); if (!validate_inputs(& @1, state)) { YYERROR; @@ -817,7 +817,7 @@ srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */ | attribBinding { set_src_reg(& $$, PROGRAM_INPUT, $1); - state->prog->InputsRead |= (1U << $$.Base.Index); + state->prog->InputsRead |= BITFIELD64_BIT($$.Base.Index); if (!validate_inputs(& @1, state)) { YYERROR; @@ -2768,7 +2768,7 @@ _mesa_parse_arb_program(struct gl_context *ctx, GLenum target, const GLubyte *st state->prog->NumInstructions++; state->prog->NumParameters = state->prog->Parameters->NumParameters; - state->prog->NumAttributes = _mesa_bitcount(state->prog->InputsRead); + state->prog->NumAttributes = _mesa_bitcount_64(state->prog->InputsRead); /* * Initialize native counts to logical counts. The device driver may diff --git a/mesalib/src/mesa/program/programopt.c b/mesalib/src/mesa/program/programopt.c index c72dfb23b..389ea218b 100644 --- a/mesalib/src/mesa/program/programopt.c +++ b/mesalib/src/mesa/program/programopt.c @@ -631,7 +631,7 @@ _mesa_nop_fragment_program(struct gl_context *ctx, struct gl_fragment_program *p prog->Base.Instructions = inst; prog->Base.NumInstructions = 2; - prog->Base.InputsRead = 1 << inputAttr; + prog->Base.InputsRead = BITFIELD64_BIT(inputAttr); prog->Base.OutputsWritten = BITFIELD64_BIT(FRAG_RESULT_COLOR); } @@ -675,7 +675,7 @@ _mesa_nop_vertex_program(struct gl_context *ctx, struct gl_vertex_program *prog) prog->Base.Instructions = inst; prog->Base.NumInstructions = 2; - prog->Base.InputsRead = 1 << inputAttr; + prog->Base.InputsRead = BITFIELD64_BIT(inputAttr); prog->Base.OutputsWritten = BITFIELD64_BIT(VERT_RESULT_COL0); /* |