summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-05-25 17:46:45 -0400
committerIlia Mirkin <imirkin@alum.mit.edu>2015-05-25 21:45:31 -0400
commit3ec18152858fd9aadb398d78d5ad2d2b938507c1 (patch)
treeec78254a2e4417c51352ed83c72639b724a202da
parent25be70462dbb7ee994e69ffccc3de94e4114e667 (diff)
downloadexternal_mesa3d-3ec18152858fd9aadb398d78d5ad2d2b938507c1.zip
external_mesa3d-3ec18152858fd9aadb398d78d5ad2d2b938507c1.tar.gz
external_mesa3d-3ec18152858fd9aadb398d78d5ad2d2b938507c1.tar.bz2
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>
-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 c8960db..1ce0589 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;