summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/drivers/nv30/nv30_context.h2
-rw-r--r--src/gallium/drivers/nv30/nv30_state_emit.c2
-rw-r--r--src/gallium/drivers/nv30/nv30_vbo.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
index 0c900c5598..c41cb29201 100644
--- a/src/gallium/drivers/nv30/nv30_context.h
+++ b/src/gallium/drivers/nv30/nv30_context.h
@@ -192,7 +192,7 @@ extern void nv30_fragtex_bind(struct nv30_context *);
/* nv30_state.c and friends */
extern boolean nv30_state_validate(struct nv30_context *nv30);
-extern void nv30_emit_hw_state(struct nv30_context *nv30);
+extern void nv30_state_emit(struct nv30_context *nv30);
extern void nv30_state_tex_update(struct nv30_context *nv30);
extern struct nv30_state_entry nv30_state_rasterizer;
extern struct nv30_state_entry nv30_state_scissor;
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c
index c4ccc9422b..1e69a6a6e2 100644
--- a/src/gallium/drivers/nv30/nv30_state_emit.c
+++ b/src/gallium/drivers/nv30/nv30_state_emit.c
@@ -46,7 +46,7 @@ nv30_state_do_validate(struct nv30_context *nv30,
}
void
-nv30_emit_hw_state(struct nv30_context *nv30)
+nv30_state_emit(struct nv30_context *nv30)
{
struct nv30_state *state = &nv30->state;
struct nv30_screen *screen = nv30->screen;
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c
index 8e4ee7a874..0f82adfee0 100644
--- a/src/gallium/drivers/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nv30/nv30_vbo.c
@@ -156,7 +156,7 @@ nv30_vbo_validate_state(struct nv30_context *nv30,
nv30_state_validate(nv30);
- nv30_emit_hw_state(nv30);
+ nv30_state_emit(nv30);
if (nv30->dirty & NV30_NEW_ARRAYS) {
nv30_vbo_arrays_update(nv30);