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

tgsi/ureg: always emit constants (and their decls) as 2D

Browse Source 
Acked-by: Roland Scheidegger <sroland@vmware.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Nicolai Hähnle
2017-08-23 17:48:27 +02:00
committed by Nicolai Hähnle
parent 37dd8e8dee
commit 41e342d548
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/tgsi/tgsi_ureg.c
+7 -15
View File
@@ -180,8 +180,7 @@ struct ureg_program
unsigned array_temps[UREG_MAX_ARRAY_TEMPS]; unsigned array_temps[UREG_MAX_ARRAY_TEMPS];
unsigned nr_array_temps; unsigned nr_array_temps;
struct const_decl const_decls; struct const_decl const_decls[PIPE_MAX_CONSTANT_BUFFERS];
struct const_decl const_decls2D[PIPE_MAX_CONSTANT_BUFFERS];
unsigned properties[TGSI_PROPERTY_COUNT]; unsigned properties[TGSI_PROPERTY_COUNT];
@@ -507,7 +506,7 @@ ureg_DECL_constant2D(struct ureg_program *ureg,
unsigned last, unsigned last,
unsigned index2D) unsigned index2D)
{ {
struct const_decl *decl = &ureg->const_decls2D[index2D]; struct const_decl *decl = &ureg->const_decls[index2D];
assert(index2D < PIPE_MAX_CONSTANT_BUFFERS); assert(index2D < PIPE_MAX_CONSTANT_BUFFERS);
@@ -529,7 +528,7 @@ struct ureg_src
ureg_DECL_constant(struct ureg_program *ureg, ureg_DECL_constant(struct ureg_program *ureg,
unsigned index) unsigned index)
{ {
struct const_decl *decl = &ureg->const_decls; struct const_decl *decl = &ureg->const_decls[0];
unsigned minconst = index, maxconst = index; unsigned minconst = index, maxconst = index;
unsigned i; unsigned i;
@@ -579,7 +578,9 @@ out:
assert(i < decl->nr_constant_ranges); assert(i < decl->nr_constant_ranges);
assert(decl->constant_range[i].first <= index); assert(decl->constant_range[i].first <= index);
assert(decl->constant_range[i].last >= index); assert(decl->constant_range[i].last >= index);
return ureg_src_register(TGSI_FILE_CONSTANT, index);
struct ureg_src src = ureg_src_register(TGSI_FILE_CONSTANT, index);
return ureg_src_dimension(src, 0);
} }
static struct ureg_dst alloc_temporary( struct ureg_program *ureg, static struct ureg_dst alloc_temporary( struct ureg_program *ureg,
@@ -1891,17 +1892,8 @@ static void emit_decls( struct ureg_program *ureg )
emit_decl_memory(ureg, i); emit_decl_memory(ureg, i);
} }
if (ureg->const_decls.nr_constant_ranges) {
for (i = 0; i < ureg->const_decls.nr_constant_ranges; i++) {
emit_decl_range(ureg,
TGSI_FILE_CONSTANT,
ureg->const_decls.constant_range[i].first,
ureg->const_decls.constant_range[i].last - ureg->const_decls.constant_range[i].first + 1);
}
}
for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) { for (i = 0; i < PIPE_MAX_CONSTANT_BUFFERS; i++) {
struct const_decl *decl = &ureg->const_decls2D[i]; struct const_decl *decl = &ureg->const_decls[i];
if (decl->nr_constant_ranges) { if (decl->nr_constant_ranges) {
uint j; uint j;