diff options
author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-05-25 17:46:45 -0400 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-06-03 11:53:33 +0100 |
commit | 6338bd6f7000e9fc60161b27f4f66be857d22351 (patch) | |
tree | 15125f71132b07800a1eade26e9ba3a1f82e1b6f | |
parent | 7087a507bfccf8e96889eb8f86a48268b7525d20 (diff) | |
download | mesa-6338bd6f7000e9fc60161b27f4f66be857d22351.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.c | 5 |
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 51e1fb646e0..a2ae4a8f278 100644 --- a/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c +++ b/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c @@ -873,9 +873,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; |