From 534f5e8d802c5bac7349152128931228c78bf1ef Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Mon, 25 May 2015 17:46:45 -0400 Subject: 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 Cc: "10.5 10.6" (cherry picked from commit 3ec18152858fd9aadb398d78d5ad2d2b938507c1) --- src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c | 5 ++--- 1 file 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; -- cgit v1.2.1