fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tgsi: finish declaration parsing for arrays.

Browse source 
I previously fixed this partly in 9e8400f4c9,
however I didn't go far enough in testing it, now when I parse a TGSI shader
with arrays in it my iterator can see the ArrayID set to the proper value.

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2013-08-12 17:34:27 +10:00
parent 92cbfded6a
commit 81204d0e9c
1 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/gallium/auxiliary/tgsi/tgsi_build.c
View file

@ -124,6 +124,7 @@ tgsi_build_declaration(
unsigned semantic,
unsigned invariant,
unsigned local,
unsigned array,
struct tgsi_header *header )
{
struct tgsi_declaration declaration;
@ -139,7 +140,7 @@ tgsi_build_declaration(
declaration.Semantic = semantic;
declaration.Invariant = invariant;
declaration.Local = local;
declaration.Array = array;
header_bodysize_grow( header );
return declaration;
@ -339,6 +340,21 @@ tgsi_default_declaration_array( void )
return a;
}
static struct tgsi_declaration_array
tgsi_build_declaration_array(unsigned arrayid,
struct tgsi_declaration *declaration,
struct tgsi_header *header)
{
struct tgsi_declaration_array da;
da = tgsi_default_declaration_array();
da.ArrayID = arrayid;
declaration_grow(declaration, header);
return da;
}
struct tgsi_full_declaration
tgsi_default_full_declaration( void )
{
@ -379,6 +395,7 @@ tgsi_build_full_declaration(
full_decl->Declaration.Semantic,
full_decl->Declaration.Invariant,
full_decl->Declaration.Local,
full_decl->Declaration.Array,
header );
if (maxsize <= size)
@ -472,6 +489,19 @@ tgsi_build_full_declaration(
header);
}
if (full_decl->Declaration.Array) {
struct tgsi_declaration_array *da;
if (maxsize <= size) {
return 0;
}
da = (struct tgsi_declaration_array *)&tokens[size];
size++;
*da = tgsi_build_declaration_array(
full_decl->Array.ArrayID,
declaration,
header);
}
return size;
}