dri/nouveau: Remove some CI remnants.
authorFrancisco Jerez <currojerez@riseup.net>
Thu, 4 Mar 2010 22:19:49 +0000 (23:19 +0100)
committerFrancisco Jerez <currojerez@riseup.net>
Thu, 4 Mar 2010 22:43:02 +0000 (23:43 +0100)
src/mesa/drivers/dri/nouveau/nouveau_state.h
src/mesa/drivers/dri/nouveau/nv04_context.c
src/mesa/drivers/dri/nouveau/nv10_context.c
src/mesa/drivers/dri/nouveau/nv10_driver.h
src/mesa/drivers/dri/nouveau/nv10_state_raster.c
src/mesa/drivers/dri/nouveau/nv20_context.c

index d001fa2..d01d962 100644 (file)
@@ -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,
index 1acd41d..a442425 100644 (file)
@@ -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,
index 8e70c41..860d0ae 100644 (file)
@@ -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,
index b5ab19b..d662712 100644 (file)
@@ -100,9 +100,6 @@ 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);
 
 void
index 68882ef..a62cd80 100644 (file)
@@ -119,11 +119,6 @@ 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)
 {
        struct nouveau_channel *chan = context_chan(ctx);
index 635b5c0..db39ef7 100644 (file)
@@ -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,