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

tgsi/ureg: rename and simplify ureg_DECL_gs_input 

There is nothing special about it and it's used for tessellation shaders
too.
This commit is contained in:
Marek Olšák 2015-05-10 13:10:03 +02:00
parent 918ca4031f
commit 3b1d157751
4 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gallium/auxiliary/tgsi/tgsi_ureg.c
View File

@ -116,8 +116,8 @@ struct ureg_program
unsigned index;
unsigned semantic_name;
unsigned semantic_index;
} gs_input[UREG_MAX_INPUT];
unsigned nr_gs_inputs;
} input[UREG_MAX_INPUT];
unsigned nr_inputs;
struct {
unsigned index;
@ -308,22 +308,23 @@ ureg_DECL_vs_input( struct ureg_program *ureg,
struct ureg_src
ureg_DECL_gs_input(struct ureg_program *ureg,
unsigned index,
ureg_DECL_input(struct ureg_program *ureg,
unsigned semantic_name,
unsigned semantic_index)
{
if (ureg->nr_gs_inputs < UREG_MAX_INPUT) {
ureg->gs_input[ureg->nr_gs_inputs].index = index;
ureg->gs_input[ureg->nr_gs_inputs].semantic_name = semantic_name;
ureg->gs_input[ureg->nr_gs_inputs].semantic_index = semantic_index;
ureg->nr_gs_inputs++;
int i = 0;
if (ureg->nr_inputs < UREG_MAX_INPUT) {
i = ureg->nr_inputs;
ureg->input[i].index = i;
ureg->input[i].semantic_name = semantic_name;
ureg->input[i].semantic_index = semantic_index;
ureg->nr_inputs++;
} else {
set_bad(ureg);
}
/* XXX: Add suport for true 2D input registers. */
return ureg_src_register(TGSI_FILE_INPUT, index);
return ureg_src_register(TGSI_FILE_INPUT, i);
}
@ -1498,12 +1499,12 @@ static void emit_decls( struct ureg_program *ureg )
ureg->fs_input[i].array_id);
}
} else {
for (i = 0; i < ureg->nr_gs_inputs; i++) {
for (i = 0; i < ureg->nr_inputs; i++) {
emit_decl_semantic(ureg,
TGSI_FILE_INPUT,
ureg->gs_input[i].index,
ureg->gs_input[i].semantic_name,
ureg->gs_input[i].semantic_index,
ureg->input[i].index,
ureg->input[i].semantic_name,
ureg->input[i].semantic_index,
TGSI_WRITEMASK_XYZW);
}
}

7
src/gallium/auxiliary/tgsi/tgsi_ureg.h
View File

@ -209,10 +209,9 @@ ureg_DECL_vs_input( struct ureg_program *,
unsigned index );
struct ureg_src
ureg_DECL_gs_input(struct ureg_program *,
unsigned index,
unsigned semantic_name,
unsigned semantic_index);
ureg_DECL_input(struct ureg_program *,
unsigned semantic_name,
unsigned semantic_index);
struct ureg_src
ureg_DECL_system_value(struct ureg_program *,

7
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@ -5201,10 +5201,9 @@ st_translate_program(
}
else if (procType == TGSI_PROCESSOR_GEOMETRY) {
for (i = 0; i < numInputs; i++) {
t->inputs[i] = ureg_DECL_gs_input(ureg,
i,
inputSemanticName[i],
inputSemanticIndex[i]);
t->inputs[i] = ureg_DECL_input(ureg,
inputSemanticName[i],
inputSemanticIndex[i]);
}
for (i = 0; i < numOutputs; i++) {

7
src/mesa/state_tracker/st_mesa_to_tgsi.c
View File

@ -1095,10 +1095,9 @@ st_translate_mesa_program(
}
else if (procType == TGSI_PROCESSOR_GEOMETRY) {
for (i = 0; i < numInputs; i++) {
t->inputs[i] = ureg_DECL_gs_input(ureg,
i,
inputSemanticName[i],
inputSemanticIndex[i]);
t->inputs[i] = ureg_DECL_input(ureg,
inputSemanticName[i],
inputSemanticIndex[i]);
}
for (i = 0; i < numOutputs; i++) {