summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv20/nv20_vertprog.c
diff options
context:
space:
mode:
authorRoland Scheidegger <[email protected]>2009-12-22 20:54:26 +0100
committerRoland Scheidegger <[email protected]>2009-12-22 20:54:26 +0100
commit35e8283c69d80debb44b05ea79dc5f67303a7432 (patch)
treeaacfe7f201094793c3d29ec0ddcc71cb01f7476c /src/gallium/drivers/nv20/nv20_vertprog.c
parent00b463fc30b30911797c5d5eaaeae79b7a36589b (diff)
parent420ff89067515a74c9625a103cadc267d5f64bd4 (diff)
Merge branch 'gallium-edgeflags'
Conflicts: src/mesa/state_tracker/st_draw.c
Diffstat (limited to 'src/gallium/drivers/nv20/nv20_vertprog.c')
-rw-r--r--src/gallium/drivers/nv20/nv20_vertprog.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/nv20/nv20_vertprog.c b/src/gallium/drivers/nv20/nv20_vertprog.c
index 9e8aab9754a..7886c2af7e6 100644
--- a/src/gallium/drivers/nv20/nv20_vertprog.c
+++ b/src/gallium/drivers/nv20/nv20_vertprog.c
@@ -530,6 +530,9 @@ nv20_vertprog_parse_decl_output(struct nv20_vpc *vpc,
return FALSE;
}
break;
+ case TGSI_SEMANTIC_EDGEFLAG:
+ NOUVEAU_ERR("cannot handle edgeflag output\n");
+ return FALSE;
default:
NOUVEAU_ERR("bad output semantic\n");
return FALSE;