summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorZack Rusin <[email protected]>2009-12-24 13:08:36 -0500
committerZack Rusin <[email protected]>2009-12-25 05:52:20 -0500
commitfb0a9aa5e0476d8ca332753f52a9e56f9cfa8dfa (patch)
treefe3335d8896265da82fb8189b56e4d406f29906f /src/gallium/auxiliary
parentb0bc582db761ea3f47580dd2908a227987177dc2 (diff)
gallium: remove TGSI_SEMANTIC_VERTICES
it's a leftover from an early version of geometry shading support. geometry shaders now encode the primitive size in the PROPERTY token and don't need special input with their size.
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/draw/draw_gs.c13
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_dump.c1
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_text.c1
3 files changed, 6 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index 3edfb6410dc..5db2e755423 100644
--- a/src/gallium/auxiliary/draw/draw_gs.c
+++ b/src/gallium/auxiliary/draw/draw_gs.c
@@ -188,12 +188,12 @@ static void draw_fetch_geometry_input(struct draw_geometry_shader *shader,
/*debug_printf("Slot = %d (semantic = %d)\n", slot,
shader->info.input_semantic_name[slot]);*/
if (shader->info.input_semantic_name[slot] ==
- TGSI_SEMANTIC_VERTICES) {
+ TGSI_SEMANTIC_PRIMID) {
for (j = 0; j < num_primitives; ++j) {
- machine->Inputs[idx].xyzw[0].f[j] = (float)num_vertices;
- machine->Inputs[idx].xyzw[1].f[j] = (float)num_vertices;
- machine->Inputs[idx].xyzw[2].f[j] = (float)num_vertices;
- machine->Inputs[idx].xyzw[3].f[j] = (float)num_vertices;
+ machine->Inputs[idx].xyzw[0].f[j] = (float)start_primitive + j;
+ machine->Inputs[idx].xyzw[1].f[j] = (float)start_primitive + j;
+ machine->Inputs[idx].xyzw[2].f[j] = (float)start_primitive + j;
+ machine->Inputs[idx].xyzw[3].f[j] = (float)start_primitive + j;
}
++idx;
} else {
@@ -296,8 +296,7 @@ void draw_geometry_shader_run(struct draw_geometry_shader *shader,
machine->Consts = constants;
for (i = 0; i < shader->info.num_inputs; ++i) {
- if (shader->info.input_semantic_name[i] != TGSI_SEMANTIC_VERTICES &&
- shader->info.input_semantic_name[i] != TGSI_SEMANTIC_PRIMID)
+ if (shader->info.input_semantic_name[i] != TGSI_SEMANTIC_PRIMID)
++inputs_from_vs;
}
diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c b/src/gallium/auxiliary/tgsi/tgsi_dump.c
index 5bfe0198f4a..a16f7c728e7 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c
@@ -123,7 +123,6 @@ static const char *semantic_names[] =
"NORMAL",
"FACE",
"EDGEFLAG",
- "VERTICES_IN",
"PRIM_ID"
};
diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c
index 825d17a4de3..2e3f9a90e3a 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_text.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_text.c
@@ -932,7 +932,6 @@ static const char *semantic_names[TGSI_SEMANTIC_COUNT] =
"GENERIC",
"NORMAL",
"FACE",
- "VERTICES_IN",
"PRIM_ID"
};