summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nv04
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2009-12-22 20:54:26 +0100
committerRoland Scheidegger <sroland@vmware.com>2009-12-22 20:54:26 +0100
commit35e8283c69d80debb44b05ea79dc5f67303a7432 (patch)
treeaacfe7f201094793c3d29ec0ddcc71cb01f7476c /src/gallium/drivers/nv04
parent00b463fc30b30911797c5d5eaaeae79b7a36589b (diff)
parent420ff89067515a74c9625a103cadc267d5f64bd4 (diff)
Merge branch 'gallium-edgeflags'
Conflicts: src/mesa/state_tracker/st_draw.c
Diffstat (limited to 'src/gallium/drivers/nv04')
-rw-r--r--src/gallium/drivers/nv04/nv04_context.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gallium/drivers/nv04/nv04_context.c b/src/gallium/drivers/nv04/nv04_context.c
index 10d984ace9..4b33636b2e 100644
--- a/src/gallium/drivers/nv04/nv04_context.c
+++ b/src/gallium/drivers/nv04/nv04_context.c
@@ -27,11 +27,6 @@ nv04_destroy(struct pipe_context *pipe)
FREE(nv04);
}
-static void
-nv04_set_edgeflags(struct pipe_context *pipe, const unsigned *bitfield)
-{
-}
-
static boolean
nv04_init_hwctx(struct nv04_context *nv04)
{
@@ -83,7 +78,6 @@ nv04_create(struct pipe_screen *pscreen, unsigned pctx_id)
nv04->pipe.winsys = ws;
nv04->pipe.screen = pscreen;
nv04->pipe.destroy = nv04_destroy;
- nv04->pipe.set_edgeflags = nv04_set_edgeflags;
nv04->pipe.draw_arrays = nv04_draw_arrays;
nv04->pipe.draw_elements = nv04_draw_elements;
nv04->pipe.clear = nv04_clear;