From a42fd95f43929c1e2c7acf2a6e49c473e1a2a178 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 4 Mar 2010 23:19:49 +0100
Subject: dri/nouveau: Remove some CI remnants.

---
 src/mesa/drivers/dri/nouveau/nouveau_state.h     | 1 -
 src/mesa/drivers/dri/nouveau/nv04_context.c      | 1 -
 src/mesa/drivers/dri/nouveau/nv10_context.c      | 1 -
 src/mesa/drivers/dri/nouveau/nv10_driver.h       | 3 ---
 src/mesa/drivers/dri/nouveau/nv10_state_raster.c | 5 -----
 src/mesa/drivers/dri/nouveau/nv20_context.c      | 1 -
 6 files changed, 12 deletions(-)

(limited to 'src/mesa/drivers/dri')

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.h b/src/mesa/drivers/dri/nouveau/nouveau_state.h
index d001fa259aa..d01d962c9f2 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_state.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_state.h
@@ -47,7 +47,6 @@ enum {
 	NOUVEAU_STATE_FRAG,
 	NOUVEAU_STATE_FRAMEBUFFER,
 	NOUVEAU_STATE_FOG,
-	NOUVEAU_STATE_INDEX_MASK,
 	NOUVEAU_STATE_LIGHT_ENABLE,
 	NOUVEAU_STATE_LIGHT_MODEL,
 	NOUVEAU_STATE_LIGHT_SOURCE0,
diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c b/src/mesa/drivers/dri/nouveau/nv04_context.c
index 1acd41de54d..a442425e448 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_context.c
@@ -265,7 +265,6 @@ const struct nouveau_driver nv04_driver = {
 		nouveau_emit_nothing,
 		nouveau_emit_nothing,
 		nouveau_emit_nothing,
-		nouveau_emit_nothing,
 		nv04_emit_scissor,
 		nv04_defer_blend,
 		nv04_defer_control,
diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c
index 8e70c419ede..860d0aeb8f5 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_context.c
@@ -370,7 +370,6 @@ const struct nouveau_driver nv10_driver = {
 		nv10_emit_frag,
 		nv10_emit_framebuffer,
 		nv10_emit_fog,
-		nv10_emit_index_mask,
 		nv10_emit_light_enable,
 		nv10_emit_light_model,
 		nv10_emit_light_source,
diff --git a/src/mesa/drivers/dri/nouveau/nv10_driver.h b/src/mesa/drivers/dri/nouveau/nv10_driver.h
index b5ab19b3bc0..d662712533b 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nv10_driver.h
@@ -99,9 +99,6 @@ nv10_emit_depth(GLcontext *ctx, int emit);
 void
 nv10_emit_dither(GLcontext *ctx, int emit);
 
-void
-nv10_emit_index_mask(GLcontext *ctx, int emit);
-
 void
 nv10_emit_logic_opcode(GLcontext *ctx, int emit);
 
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_raster.c b/src/mesa/drivers/dri/nouveau/nv10_state_raster.c
index 68882ef05f2..a62cd807a91 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state_raster.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_raster.c
@@ -118,11 +118,6 @@ nv10_emit_dither(GLcontext *ctx, int emit)
 	OUT_RING(chan, ctx->Color.DitherFlag ? 1 : 0);
 }
 
-void
-nv10_emit_index_mask(GLcontext *ctx, int emit)
-{
-}
-
 void
 nv10_emit_logic_opcode(GLcontext *ctx, int emit)
 {
diff --git a/src/mesa/drivers/dri/nouveau/nv20_context.c b/src/mesa/drivers/dri/nouveau/nv20_context.c
index 635b5c09968..db39ef70750 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_context.c
@@ -459,7 +459,6 @@ const struct nouveau_driver nv20_driver = {
 		nv20_emit_frag,
 		nv20_emit_framebuffer,
 		nv20_emit_fog,
-		nv10_emit_index_mask,
 		nv10_emit_light_enable,
 		nv20_emit_light_model,
 		nv20_emit_light_source,
-- 
cgit v1.2.3