[Mesa-dev] [PATCH 5/9] gallium: add R8G8_R8B8 and G8R8_B8R8 format

Christian König deathsimple at vodafone.de
Wed Mar 7 06:13:46 PST 2012


Oh crap! Don't bother taking a look that was the wrong version of the 
patch series. Going to resent them in a couple of minutes.

Christian.

On 07.03.2012 15:10, Christian König wrote:
> v2: simplify implementation by using correct swizzle
>
> Signed-off-by: Christian König<deathsimple at vodafone.de>
> ---
>   src/gallium/auxiliary/util/u_format.csv   |    2 +
>   src/gallium/auxiliary/util/u_format_yuv.c |   48 +++++++++++++++++++++++++++++
>   src/gallium/auxiliary/util/u_format_yuv.h |   46 +++++++++++++++++++++++++++
>   src/gallium/drivers/r600/r600_texture.c   |   41 ++++++++++++++++++++++++
>   src/gallium/include/pipe/p_format.h       |    3 ++
>   5 files changed, 140 insertions(+), 0 deletions(-)
>
> diff --git a/src/gallium/auxiliary/util/u_format.csv b/src/gallium/auxiliary/util/u_format.csv
> index 345cc9d..05f04b5 100644
> --- a/src/gallium/auxiliary/util/u_format.csv
> +++ b/src/gallium/auxiliary/util/u_format.csv
> @@ -145,6 +145,8 @@ PIPE_FORMAT_YUYV                 , subsampled, 2, 1, x32 ,     ,     ,     , xyz
>   # same subsampling but with rgb channels
>   PIPE_FORMAT_R8G8_B8G8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, rgb
>   PIPE_FORMAT_G8R8_G8B8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, rgb
> +PIPE_FORMAT_G8R8_B8R8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , yxz1, rgb
> +PIPE_FORMAT_R8G8_R8B8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , yxz1, rgb
>
>   # some special formats not fitting anywhere else
>   PIPE_FORMAT_R11G11B10_FLOAT       , other,      1,  1, x32 ,     ,     ,     , xyz1, rgb
> diff --git a/src/gallium/auxiliary/util/u_format_yuv.c b/src/gallium/auxiliary/util/u_format_yuv.c
> index 38a25b1..c7fdaa0 100644
> --- a/src/gallium/auxiliary/util/u_format_yuv.c
> +++ b/src/gallium/auxiliary/util/u_format_yuv.c
> @@ -1142,3 +1142,51 @@ util_format_nv21_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
>   void
>   util_format_nv21_fetch_rgba_float(float *dst, const uint8_t *src,
>                                unsigned i, unsigned j) {}
> +
> +void
> +util_format_r8g8_r8b8_unorm_unpack_rgba_float(float *dst_row, unsigned dst_stride,
> +                                         const uint8_t *src_row, unsigned src_stride,
> +                                         unsigned width, unsigned height) {}
> +
> +void
> +util_format_r8g8_r8b8_unorm_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
> +                                          const uint8_t *src_row, unsigned src_stride,
> +                                          unsigned width, unsigned height) {}
> +
> +void
> +util_format_r8g8_r8b8_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
> +                                       const float *src_row, unsigned src_stride,
> +                                       unsigned width, unsigned height) {}
> +
> +void
> +util_format_r8g8_r8b8_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
> +                                        const uint8_t *src_row, unsigned src_stride,
> +                                        unsigned width, unsigned height) {}
> +
> +void
> +util_format_r8g8_r8b8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
> +                                        unsigned i, unsigned j) {}
> +
> +void
> +util_format_g8r8_b8r8_unorm_unpack_rgba_float(float *dst_row, unsigned dst_stride,
> +                                         const uint8_t *src_row, unsigned src_stride,
> +                                         unsigned width, unsigned height) {}
> +
> +void
> +util_format_g8r8_b8r8_unorm_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
> +                                          const uint8_t *src_row, unsigned src_stride,
> +                                          unsigned width, unsigned height) {}
> +
> +void
> +util_format_g8r8_b8r8_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
> +                                       const float *src_row, unsigned src_stride,
> +                                       unsigned width, unsigned height) {}
> +
> +void
> +util_format_g8r8_b8r8_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
> +                                        const uint8_t *src_row, unsigned src_stride,
> +                                        unsigned width, unsigned height) {}
> +
> +void
> +util_format_g8r8_b8r8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
> +                                        unsigned i, unsigned j) {}
> diff --git a/src/gallium/auxiliary/util/u_format_yuv.h b/src/gallium/auxiliary/util/u_format_yuv.h
> index 4cb22df..4ec3981 100644
> --- a/src/gallium/auxiliary/util/u_format_yuv.h
> +++ b/src/gallium/auxiliary/util/u_format_yuv.h
> @@ -313,6 +313,52 @@ void
>   util_format_g8r8_g8b8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
>                                           unsigned i, unsigned j);
>
> +void
> +util_format_r8g8_r8b8_unorm_unpack_rgba_float(float *dst_row, unsigned dst_stride,
> +                                         const uint8_t *src_row, unsigned src_stride,
> +                                         unsigned width, unsigned height);
> +
> +void
> +util_format_r8g8_r8b8_unorm_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
> +                                          const uint8_t *src_row, unsigned src_stride,
> +                                          unsigned width, unsigned height);
> +
> +void
> +util_format_r8g8_r8b8_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
> +                                       const float *src_row, unsigned src_stride,
> +                                       unsigned width, unsigned height);
> +
> +void
> +util_format_r8g8_r8b8_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
> +                                        const uint8_t *src_row, unsigned src_stride,
> +                                        unsigned width, unsigned height);
> +
> +void
> +util_format_r8g8_r8b8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
> +                                        unsigned i, unsigned j);
>
> +void
> +util_format_g8r8_b8r8_unorm_unpack_rgba_float(float *dst_row, unsigned dst_stride,
> +                                         const uint8_t *src_row, unsigned src_stride,
> +                                         unsigned width, unsigned height);
> +
> +void
> +util_format_g8r8_b8r8_unorm_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
> +                                          const uint8_t *src_row, unsigned src_stride,
> +                                          unsigned width, unsigned height);
> +
> +void
> +util_format_g8r8_b8r8_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
> +                                       const float *src_row, unsigned src_stride,
> +                                       unsigned width, unsigned height);
> +
> +void
> +util_format_g8r8_b8r8_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
> +                                        const uint8_t *src_row, unsigned src_stride,
> +                                        unsigned width, unsigned height);
> +
> +void
> +util_format_g8r8_b8r8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
> +                                        unsigned i, unsigned j);
>
>   #endif /* U_FORMAT_YUV_H_ */
> diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
> index 923efce..4aff04a 100644
> --- a/src/gallium/drivers/r600/r600_texture.c
> +++ b/src/gallium/drivers/r600/r600_texture.c
> @@ -1135,6 +1135,47 @@ uint32_t r600_translate_texformat(struct pipe_screen *screen,
>   		}
>   	}
>
> +	if (desc->layout == UTIL_FORMAT_LAYOUT_SUBSAMPLED) {
> +		const unsigned char *swizzle;
> +		const unsigned char swizzle_zyx[] = {
> +			UTIL_FORMAT_SWIZZLE_Z,
> +			UTIL_FORMAT_SWIZZLE_Y,
> +			UTIL_FORMAT_SWIZZLE_X,
> +			UTIL_FORMAT_SWIZZLE_1,
> +		};
> +		const unsigned char swizzle_yzx[] = {
> +			UTIL_FORMAT_SWIZZLE_Y,
> +			UTIL_FORMAT_SWIZZLE_Z,
> +			UTIL_FORMAT_SWIZZLE_X,
> +			UTIL_FORMAT_SWIZZLE_1,
> +		};
> +
> +		switch (format) {
> +		case PIPE_FORMAT_R8G8_B8G8_UNORM:
> +			swizzle = swizzle_zyx;
> +			result = FMT_GB_GR;
> +			break;
> +		case PIPE_FORMAT_G8R8_G8B8_UNORM:
> +			swizzle = swizzle_zyx;
> +			result = FMT_BG_RG;
> +			break;
> +		case PIPE_FORMAT_R8G8_R8B8_UNORM:
> +			swizzle = swizzle_yzx;
> +			result = FMT_BG_RG;
> +			break;
> +		case PIPE_FORMAT_G8R8_B8R8_UNORM:
> +			swizzle = swizzle_yzx;
> +			result = FMT_GB_GR;
> +			break;
> +		default:
> +			goto out_unknown;
> +		}
> +		word4&= C_038010_DST_SEL_X&  C_038010_DST_SEL_Y&
> +			 C_038010_DST_SEL_Z&  C_038010_DST_SEL_W;
> +		word4 |= r600_get_swizzle_combined(swizzle, swizzle_view);
> +		goto out_word4;
> +	}
> +
>   	if (format == PIPE_FORMAT_R9G9B9E5_FLOAT) {
>   		result = FMT_5_9_9_9_SHAREDEXP;
>   		goto out_word4;
> diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
> index c58f390..4f0d1f2 100644
> --- a/src/gallium/include/pipe/p_format.h
> +++ b/src/gallium/include/pipe/p_format.h
> @@ -311,6 +311,9 @@ enum pipe_format {
>
>      PIPE_FORMAT_ETC1_RGB8               = 226,
>
> +   PIPE_FORMAT_R8G8_R8B8_UNORM         = 227,
> +   PIPE_FORMAT_G8R8_B8R8_UNORM         = 228,
> +
>      PIPE_FORMAT_COUNT
>   };
>



More information about the mesa-dev mailing list