r300/compiler: move util functions to radeon_compiler_util

[mesa.git] / src / mesa / drivers / dri / r300 / compiler / radeon_program.h

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program.h b/src/mesa/drivers/dri/r300/compiler/radeon_program.h
index 772ea14df341d987836c968e1dcd3337825dcb85..df6c94b35f9ba07bbd1ef0aa76b1028ad3adb113 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program.h
@@ -159,74 +159,6 @@ struct rc_program {
        struct rc_constant_list Constants;
 };
 
-static inline rc_swizzle get_swz(unsigned int swz, rc_swizzle idx)
-{
-       if (idx & 0x4)
-               return idx;
-       return GET_SWZ(swz, idx);
-}
-
-static inline unsigned int combine_swizzles4(unsigned int src,
-               rc_swizzle swz_x, rc_swizzle swz_y, rc_swizzle swz_z, rc_swizzle swz_w)
-{
-       unsigned int ret = 0;
-
-       ret |= get_swz(src, swz_x);
-       ret |= get_swz(src, swz_y) << 3;
-       ret |= get_swz(src, swz_z) << 6;
-       ret |= get_swz(src, swz_w) << 9;
-
-       return ret;
-}
-
-static inline unsigned int combine_swizzles(unsigned int src, unsigned int swz)
-{
-       unsigned int ret = 0;
-
-       ret |= get_swz(src, GET_SWZ(swz, RC_SWIZZLE_X));
-       ret |= get_swz(src, GET_SWZ(swz, RC_SWIZZLE_Y)) << 3;
-       ret |= get_swz(src, GET_SWZ(swz, RC_SWIZZLE_Z)) << 6;
-       ret |= get_swz(src, GET_SWZ(swz, RC_SWIZZLE_W)) << 9;
-
-       return ret;
-}
-
-/**
- * @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_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;
-       }
-       return RC_SWIZZLE_UNUSED;
-}
-
-/* Reorder mask bits according to swizzle. */
-static inline unsigned swizzle_mask(unsigned swizzle, unsigned mask)
-{
-       unsigned ret = 0;
-       for (unsigned chan = 0; chan < 4; ++chan) {
-               unsigned swz = GET_SWZ(swizzle, chan);
-               if (swz < 4)
-                       ret |= GET_BIT(mask, swz) << chan;
-       }
-       return ret;
-}
-
-
-struct rc_src_register lmul_swizzle(unsigned int swizzle, struct rc_src_register srcreg);
-
-static inline void reset_srcreg(struct rc_src_register* reg)
-{
-       memset(reg, 0, sizeof(struct rc_src_register));
-       reg->Swizzle = RC_SWIZZLE_XYZW;
-}
-
-
 /**
  * A transformation that can be passed to \ref rc_local_transform.
  *