Mesa (pipe-video): [g3dvl] remove unused color_swizzle from idct code

Christian König deathsimple at kemper.freedesktop.org
Sun Apr 3 12:01:20 PDT 2011


Module: Mesa
Branch: pipe-video
Commit: 59774e5c7a2756c5c430fc74bc80ea75d54f594d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=59774e5c7a2756c5c430fc74bc80ea75d54f594d

Author: Christian König <deathsimple at vodafone.de>
Date:   Sat Apr  2 22:36:26 2011 +0200

[g3dvl] remove unused color_swizzle from idct code

---

 src/gallium/auxiliary/vl/vl_idct.c           |   12 ++++++------
 src/gallium/auxiliary/vl/vl_idct.h           |    2 +-
 src/gallium/auxiliary/vl/vl_mpeg12_context.c |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gallium/auxiliary/vl/vl_idct.c b/src/gallium/auxiliary/vl/vl_idct.c
index c73b476..6bebac1 100644
--- a/src/gallium/auxiliary/vl/vl_idct.c
+++ b/src/gallium/auxiliary/vl/vl_idct.c
@@ -90,7 +90,7 @@ calc_addr(struct ureg_program *shader, struct ureg_dst addr[2],
 }
 
 static void *
-create_vert_shader(struct vl_idct *idct, bool matrix_stage, int color_swizzle)
+create_vert_shader(struct vl_idct *idct, bool matrix_stage)
 {
    struct ureg_program *shader;
    struct ureg_src vrect, vpos, vblock, eb;
@@ -358,9 +358,9 @@ create_transpose_frag_shader(struct vl_idct *idct)
 }
 
 static bool
-init_shaders(struct vl_idct *idct, int color_swizzle)
+init_shaders(struct vl_idct *idct)
 {
-   idct->matrix_vs = create_vert_shader(idct, true, color_swizzle);
+   idct->matrix_vs = create_vert_shader(idct, true);
    if (!idct->matrix_vs)
       goto error_matrix_vs;
 
@@ -368,7 +368,7 @@ init_shaders(struct vl_idct *idct, int color_swizzle)
    if (!idct->matrix_fs)
       goto error_matrix_fs;
 
-   idct->transpose_vs = create_vert_shader(idct, false, color_swizzle);
+   idct->transpose_vs = create_vert_shader(idct, false);
    if (!idct->transpose_vs)
       goto error_transpose_vs;
 
@@ -616,7 +616,7 @@ error_matrix:
 bool vl_idct_init(struct vl_idct *idct, struct pipe_context *pipe,
                   unsigned buffer_width, unsigned buffer_height,
                   unsigned blocks_x, unsigned blocks_y,
-                  int color_swizzle, struct pipe_sampler_view *matrix)
+                  struct pipe_sampler_view *matrix)
 {
    assert(idct && pipe && matrix);
 
@@ -627,7 +627,7 @@ bool vl_idct_init(struct vl_idct *idct, struct pipe_context *pipe,
    idct->blocks_y = blocks_y;
    pipe_sampler_view_reference(&idct->matrix, matrix);
 
-   if(!init_shaders(idct, color_swizzle))
+   if(!init_shaders(idct))
       return false;
 
    if(!init_state(idct)) {
diff --git a/src/gallium/auxiliary/vl/vl_idct.h b/src/gallium/auxiliary/vl/vl_idct.h
index e0d4412..2d6778d 100644
--- a/src/gallium/auxiliary/vl/vl_idct.h
+++ b/src/gallium/auxiliary/vl/vl_idct.h
@@ -80,7 +80,7 @@ struct pipe_sampler_view *vl_idct_upload_matrix(struct pipe_context *pipe);
 bool vl_idct_init(struct vl_idct *idct, struct pipe_context *pipe,
                   unsigned buffer_width, unsigned buffer_height,
                   unsigned blocks_x, unsigned blocks_y,
-                  int color_swizzle, struct pipe_sampler_view *matrix);
+                  struct pipe_sampler_view *matrix);
 
 /* destroy an idct instance */
 void vl_idct_cleanup(struct vl_idct *idct);
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_context.c b/src/gallium/auxiliary/vl/vl_mpeg12_context.c
index ac59793..be598a8 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_context.c
+++ b/src/gallium/auxiliary/vl/vl_mpeg12_context.c
@@ -641,7 +641,7 @@ init_idct(struct vl_mpeg12_context *ctx, unsigned buffer_width, unsigned buffer_
       goto error_idct_matrix;
 
    if (!vl_idct_init(&ctx->idct_y, ctx->pipe, buffer_width, buffer_height,
-                     2, 2, TGSI_SWIZZLE_X, idct_matrix))
+                     2, 2, idct_matrix))
       goto error_idct_y;
 
    if (ctx->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420) {
@@ -662,7 +662,7 @@ init_idct(struct vl_mpeg12_context *ctx, unsigned buffer_width, unsigned buffer_
    }
 
    if(!vl_idct_init(&ctx->idct_c, ctx->pipe, chroma_width, chroma_height,
-                    chroma_blocks_x, chroma_blocks_y, TGSI_SWIZZLE_Y, idct_matrix))
+                    chroma_blocks_x, chroma_blocks_y, idct_matrix))
       goto error_idct_c;
 
    pipe_sampler_view_reference(&idct_matrix, NULL);



More information about the mesa-commit mailing list