summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorPatrice Mandin <pmandin@caramail.com>2008-07-12 12:24:37 +0200
committerPatrice Mandin <pmandin@caramail.com>2008-07-12 12:24:37 +0200
commitac44f334e3492ab68eb310cfe43ed22206a042d8 (patch)
tree9bd65d1ab51d78b1c269297424714750fb1a93eb /src/gallium
parent3d0e18ff5fba368a66bf34d18d219bf9a2dfba90 (diff)
nv30: Move edgeflag stuff
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nv30/nv30_context.c7
-rw-r--r--src/gallium/drivers/nv30/nv30_context.h1
-rw-r--r--src/gallium/drivers/nv30/nv30_state.c11
3 files changed, 12 insertions, 7 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c
index b2d9d3f181..eefc614e5b 100644
--- a/src/gallium/drivers/nv30/nv30_context.c
+++ b/src/gallium/drivers/nv30/nv30_context.c
@@ -32,12 +32,6 @@ nv30_destroy(struct pipe_context *pipe)
FREE(nv30);
}
-
-static void
-nv30_set_edgeflags(struct pipe_context *pipe, const unsigned *bitfield)
-{
-}
-
struct pipe_context *
nv30_create(struct pipe_screen *pscreen, unsigned pctx_id)
{
@@ -57,7 +51,6 @@ nv30_create(struct pipe_screen *pscreen, unsigned pctx_id)
nv30->pipe.winsys = ws;
nv30->pipe.screen = pscreen;
nv30->pipe.destroy = nv30_destroy;
- nv30->pipe.set_edgeflags = nv30_set_edgeflags;
nv30->pipe.draw_arrays = nv30_draw_arrays;
nv30->pipe.draw_elements = nv30_draw_elements;
nv30->pipe.clear = nv30_clear;
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index ef8c16bdbb..2e7b62a69a 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -142,6 +142,7 @@ struct nv30_context {
struct pipe_vertex_buffer vtxbuf[PIPE_MAX_ATTRIBS];
struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
+ const unsigned *edgeflags;
};
static INLINE struct nv30_context *
diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 8dc16d361d..4fe1def74d 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -657,6 +657,16 @@ nv30_set_vertex_elements(struct pipe_context *pipe, unsigned count,
nv30->dirty |= NV30_NEW_ARRAYS;
}
+static void
+nv30_set_edgeflags(struct pipe_context *pipe, const unsigned *bitfield)
+{
+ struct nv30_context *nv30 = nv30_context(pipe);
+
+ nv30->edgeflags = bitfield;
+ nv30->dirty |= NV30_NEW_ARRAYS;
+ /*nv30->draw_dirty |= NV30_NEW_ARRAYS;*/
+}
+
void
nv30_init_state_functions(struct nv30_context *nv30)
{
@@ -696,6 +706,7 @@ nv30_init_state_functions(struct nv30_context *nv30)
nv30->pipe.set_scissor_state = nv30_set_scissor_state;
nv30->pipe.set_viewport_state = nv30_set_viewport_state;
+ nv30->pipe.set_edgeflags = nv30_set_edgeflags;
nv30->pipe.set_vertex_buffers = nv30_set_vertex_buffers;
nv30->pipe.set_vertex_elements = nv30_set_vertex_elements;
}