r300/compiler: remove duplicate function rc_mask_to_swz

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
index cbb5ef6237e98962534fe1b33847c2f20e0e5f2e..9beb5d6357996c9651796742c6e3fba6ea55ecdb 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
@@ -701,7 +701,7 @@ static int convert_rgb_to_alpha(
                                get_reg_valuep(s,
                                        RC_FILE_TEMPORARY,
                                        pair_inst->RGB.DestIndex,
-                                       rc_mask_to_swz(old_mask));
+                                       rc_mask_to_swizzle(old_mask));
                        new_index = i;
                        *new_regvalp = *old_regvalp;
                        *old_regvalp = NULL;

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program.c b/src/mesa/drivers/dri/r300/compiler/radeon_program.c
index d7bedc57291938ce887ca56e0b98b70b7e1cb2bb..707882882a57ea2a7180265bc68674842a92f697 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program.c
@@ -244,14 +244,3 @@ unsigned int rc_recompute_ips(struct radeon_compiler * c)
 
        return ip;
 }
-
-rc_swizzle rc_mask_to_swizzle(unsigned int mask)
-{
-       switch(mask) {
-               case RC_MASK_X: return RC_SWIZZLE_X;
-               case RC_MASK_Y: return RC_SWIZZLE_Y;
-               case RC_MASK_Z: return RC_SWIZZLE_Z;
-               case RC_MASK_W: return RC_SWIZZLE_W;
-               default: return RC_SWIZZLE_UNUSED;
-       }
-}

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program.h b/src/mesa/drivers/dri/r300/compiler/radeon_program.h
index be078b4f4fa596a8fac216d3939ab6b7fd6283f8..913815b24d08139d7ff5845613c251d1c0601041 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program.h
@@ -194,14 +194,13 @@ static inline unsigned int combine_swizzles(unsigned int src, unsigned int swz)
 /**
  * @param mask Must be either RC_MASK_X, RC_MASK_Y, RC_MASK_Z, or RC_MASK_W
  */
-static inline rc_swizzle rc_mask_to_swz(unsigned int mask)
+static inline rc_swizzle rc_mask_to_swizzle(unsigned int mask)
 {
        switch (mask) {
        case RC_MASK_X: return RC_SWIZZLE_X;
        case RC_MASK_Y: return RC_SWIZZLE_Y;
        case RC_MASK_Z: return RC_SWIZZLE_Z;
        case RC_MASK_W: return RC_SWIZZLE_W;
-       default: assert(0);
        }
        return RC_SWIZZLE_UNUSED;
 }