iris: pipe to scs -> iris_pipe.h

diff --git a/src/gallium/drivers/iris/iris_pipe.h b/src/gallium/drivers/iris/iris_pipe.h
index 06ff938372e0bef4dd5da1f27aabc499d8a37237..1cb0a76af9ad782fce9a1195c978a8e533b57d16 100644 (file)
--- a/src/gallium/drivers/iris/iris_pipe.h
+++ b/src/gallium/drivers/iris/iris_pipe.h
@@ -40,4 +40,21 @@ stage_from_pipe(enum pipe_shader_type pstage)
    return stages[pstage];
 }
 
+/**
+ * Convert an swizzle enumeration (i.e. PIPE_SWIZZLE_X) to one of the HW's
+ * "Shader Channel Select" enumerations (i.e. SCS_RED).  The mappings are
+ *
+ * SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W, SWIZZLE_ZERO, SWIZZLE_ONE
+ *         0          1          2          3             4            5
+ *         4          5          6          7             0            1
+ *   SCS_RED, SCS_GREEN,  SCS_BLUE, SCS_ALPHA,     SCS_ZERO,     SCS_ONE
+ *
+ * which is simply adding 4 then modding by 8 (or anding with 7).
+ */
+static inline enum isl_channel_select
+pipe_swizzle_to_isl_channel(enum pipe_swizzle swizzle)
+{
+   return (swizzle + 4) & 7;
+}
+
 #endif

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 525bdf6a55e44f57cfb3ac5598a6dc1845bc04bc..86aeccd8c81f8a8c1219fcddc94ad0d3f6ad2f51 100644 (file)
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1289,23 +1289,6 @@ iris_bind_sampler_states(struct pipe_context *ctx,
    ice->state.dirty |= IRIS_DIRTY_SAMPLER_STATES_VS << stage;
 }
 
-/**
- * Convert an swizzle enumeration (i.e. PIPE_SWIZZLE_X) to one of the HW's
- * "Shader Channel Select" enumerations (i.e. SCS_RED).  The mappings are
- *
- * SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W, SWIZZLE_ZERO, SWIZZLE_ONE
- *         0          1          2          3             4            5
- *         4          5          6          7             0            1
- *   SCS_RED, SCS_GREEN,  SCS_BLUE, SCS_ALPHA,     SCS_ZERO,     SCS_ONE
- *
- * which is simply adding 4 then modding by 8 (or anding with 7).
- */
-static enum isl_channel_select
-pipe_swizzle_to_isl_channel(enum pipe_swizzle swizzle)
-{
-   return (swizzle + 4) & 7;
-}
-
 /**
  * The pipe->create_sampler_view() driver hook.
  */