KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: Use VERT_{ATTRIB,BIT}* for ARB input validation. 

For validating ARB program inputs replace hard
coded bitfield and attribute number with the appropriate
VERT_{ATTRIB,BIT}* variant.

This should fix:

https://bugs.freedesktop.org/show_bug.cgi?id=43407

Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Mathias Fröhlich 2011-12-02 08:08:07 +01:00
parent b7a69cbb71
commit b14c06e10d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/program/program_parse.y
View File

@ -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;
}

2
src/mesa/program/program_parser.h
View File

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