summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/draw/draw_prim_assembler.c
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2014-12-01 23:13:55 +0100
committerRoland Scheidegger <sroland@vmware.com>2014-12-06 18:02:59 +0100
commit3fdbad1142224f4cae9f97b75b94afba353ab392 (patch)
tree319feb60eb94cf54f2059b2b68ff00db7255d063 /src/gallium/auxiliary/draw/draw_prim_assembler.c
parentec30c66b46dd89cae3a39fbde74d39f7b29f301d (diff)
downloadexternal_mesa3d-3fdbad1142224f4cae9f97b75b94afba353ab392.tar.gz
external_mesa3d-3fdbad1142224f4cae9f97b75b94afba353ab392.tar.bz2
external_mesa3d-3fdbad1142224f4cae9f97b75b94afba353ab392.zip
draw: kill off unneded prim assembler code for handling adjacency verts
The default macros when the adjacency macros aren't defined will already exactly do that (that is, drop the adjacent vertices and call the non-adjacent macro). Reviewed-by: Jose Fonseca <jfonseca@vmwarec.com>
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_prim_assembler.c')
-rw-r--r--src/gallium/auxiliary/draw/draw_prim_assembler.c58
1 files changed, 0 insertions, 58 deletions
diff --git a/src/gallium/auxiliary/draw/draw_prim_assembler.c b/src/gallium/auxiliary/draw/draw_prim_assembler.c
index eba441c17a..c609a77b8f 100644
--- a/src/gallium/auxiliary/draw/draw_prim_assembler.c
+++ b/src/gallium/auxiliary/draw/draw_prim_assembler.c
@@ -172,31 +172,6 @@ prim_line(struct draw_assembler *asmblr,
}
static void
-prim_line_adj(struct draw_assembler *asmblr,
- unsigned i0, unsigned i1, unsigned i2, unsigned i3)
-{
- unsigned indices[2];
-
- if (asmblr->needs_primid) {
- if (asmblr->is_strip && asmblr->is_first_prim) {
- inject_primid(asmblr, i1, asmblr->primid++);
- inject_primid(asmblr, i2, asmblr->primid++);
- asmblr->is_first_prim = FALSE;
- } else if (asmblr->is_strip) {
- inject_primid(asmblr, i2, asmblr->primid++);
- } else {
- inject_primid(asmblr, i1, asmblr->primid);
- inject_primid(asmblr, i2, asmblr->primid++);
- }
- }
-
- indices[0] = i1;
- indices[1] = i2;
-
- copy_verts(asmblr, indices, 2);
-}
-
-static void
prim_tri(struct draw_assembler *asmblr,
unsigned i0, unsigned i1, unsigned i2)
{
@@ -227,39 +202,6 @@ prim_tri(struct draw_assembler *asmblr,
copy_verts(asmblr, indices, 3);
}
-static void
-prim_tri_adj(struct draw_assembler *asmblr,
- unsigned i0, unsigned i1, unsigned i2,
- unsigned i3, unsigned i4, unsigned i5)
-{
- unsigned indices[3];
-
- if (asmblr->needs_primid) {
- if (asmblr->is_strip && asmblr->is_first_prim) {
- inject_primid(asmblr, i0, asmblr->primid++);
- inject_primid(asmblr, i2, asmblr->primid++);
- inject_primid(asmblr, i4, asmblr->primid++);
- asmblr->is_first_prim = FALSE;
- } else if (asmblr->is_strip) {
- if (asmblr->num_prims & 1) {
- inject_primid(asmblr, i2, asmblr->primid++);
- } else {
- inject_primid(asmblr, i4, asmblr->primid++);
- }
- } else {
- inject_primid(asmblr, i0, asmblr->primid);
- inject_primid(asmblr, i2, asmblr->primid);
- inject_primid(asmblr, i4, asmblr->primid);
- asmblr->primid++;
- }
- }
- indices[0] = i0;
- indices[1] = i2;
- indices[2] = i4;
-
- copy_verts(asmblr, indices, 3);
-}
-
void
draw_prim_assembler_prepare_outputs(struct draw_assembler *ia)
{