summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-05-25 17:46:45 -0400
committerEmil Velikov <emil.l.velikov@gmail.com>2015-05-27 11:49:42 +0100
commit534f5e8d802c5bac7349152128931228c78bf1ef (patch)
treeddc3a9c80ef92ced31dcd8d23a1a1d05aa3af45a
parent74e2db8a9202acc7ed38a31fe0a3453ec3a7a1dd (diff)
downloadmesa-534f5e8d802c5bac7349152128931228c78bf1ef.tar.gz
nv30: falling back to draw path for edgeflag does no good
The problem is that the EDGEFLAG has to be toggled at vertex submission time. This can be done from either the draw or the regular paths. Avoid falling back to draw just because there's an edgeflag. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.5 10.6" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 3ec18152858fd9aadb398d78d5ad2d2b938507c1)
-rw-r--r--src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c b/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c
index 29d506b6e9b..24109f4ac76 100644
--- a/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c
+++ b/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c
@@ -872,9 +872,8 @@ nvfx_vertprog_parse_decl_output(struct nvfx_vpc *vpc,
}
break;
case TGSI_SEMANTIC_EDGEFLAG:
- /* not really an error just a fallback */
- NOUVEAU_ERR("cannot handle edgeflag output\n");
- return FALSE;
+ vpc->r_result[idx] = nvfx_reg(NVFXSR_NONE, 0);
+ return TRUE;
default:
NOUVEAU_ERR("bad output semantic\n");
return FALSE;