[Freedreno] [PATCH 2/4] freedreno/a3xx: fd3_util -> fd3_format
Rob Clark
robdclark at gmail.com
Sat Nov 29 05:34:39 PST 2014
On Fri, Nov 28, 2014 at 6:06 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> All the "util" helpers are actually format-related
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Rob Clark <robclark at freedesktop.org>
> ---
> src/gallium/drivers/freedreno/Makefile.sources | 4 +-
> src/gallium/drivers/freedreno/a3xx/fd3_blend.c | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_draw.c | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_emit.c | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_emit.h | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_format.c | 453 +++++++++++++++++++++
> src/gallium/drivers/freedreno/a3xx/fd3_format.h | 42 ++
> src/gallium/drivers/freedreno/a3xx/fd3_gmem.c | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_program.c | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_query.c | 2 +-
> .../drivers/freedreno/a3xx/fd3_rasterizer.c | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_screen.c | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_texture.c | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_texture.h | 2 +-
> src/gallium/drivers/freedreno/a3xx/fd3_util.c | 453 ---------------------
> src/gallium/drivers/freedreno/a3xx/fd3_util.h | 46 ---
> src/gallium/drivers/freedreno/a3xx/fd3_zsa.c | 2 +-
> 17 files changed, 509 insertions(+), 513 deletions(-)
> create mode 100644 src/gallium/drivers/freedreno/a3xx/fd3_format.c
> create mode 100644 src/gallium/drivers/freedreno/a3xx/fd3_format.h
> delete mode 100644 src/gallium/drivers/freedreno/a3xx/fd3_util.c
> delete mode 100644 src/gallium/drivers/freedreno/a3xx/fd3_util.h
>
> diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources
> index 19bb8f9..81019db 100644
> --- a/src/gallium/drivers/freedreno/Makefile.sources
> +++ b/src/gallium/drivers/freedreno/Makefile.sources
> @@ -72,6 +72,8 @@ a3xx_SOURCES := \
> a3xx/fd3_draw.h \
> a3xx/fd3_emit.c \
> a3xx/fd3_emit.h \
> + a3xx/fd3_format.c \
> + a3xx/fd3_format.h \
> a3xx/fd3_gmem.c \
> a3xx/fd3_gmem.h \
> a3xx/fd3_program.c \
> @@ -84,8 +86,6 @@ a3xx_SOURCES := \
> a3xx/fd3_screen.h \
> a3xx/fd3_texture.c \
> a3xx/fd3_texture.h \
> - a3xx/fd3_util.c \
> - a3xx/fd3_util.h \
> a3xx/fd3_zsa.c \
> a3xx/fd3_zsa.h
>
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_blend.c b/src/gallium/drivers/freedreno/a3xx/fd3_blend.c
> index 940d065..329d304 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_blend.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_blend.c
> @@ -32,7 +32,7 @@
>
> #include "fd3_blend.h"
> #include "fd3_context.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
>
>
> static enum a3xx_rb_blend_opcode
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_draw.c b/src/gallium/drivers/freedreno/a3xx/fd3_draw.c
> index b289e76..b824d21 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_draw.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_draw.c
> @@ -39,7 +39,7 @@
> #include "fd3_context.h"
> #include "fd3_emit.h"
> #include "fd3_program.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
> #include "fd3_zsa.h"
>
>
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
> index 556ff56..dba7624 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
> @@ -40,7 +40,7 @@
> #include "fd3_program.h"
> #include "fd3_rasterizer.h"
> #include "fd3_texture.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
> #include "fd3_zsa.h"
>
> /* regid: base const register
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.h b/src/gallium/drivers/freedreno/a3xx/fd3_emit.h
> index a397c87..c1bd61a 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.h
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.h
> @@ -32,7 +32,7 @@
> #include "pipe/p_context.h"
>
> #include "freedreno_context.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
> #include "fd3_program.h"
> #include "ir3_shader.h"
>
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_format.c b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
> new file mode 100644
> index 0000000..a70aceb
> --- /dev/null
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
> @@ -0,0 +1,453 @@
> +/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
> +
> +/*
> + * Copyright (C) 2013 Rob Clark <robclark at freedesktop.org>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> + * SOFTWARE.
> + *
> + * Authors:
> + * Rob Clark <robclark at freedesktop.org>
> + */
> +
> +#include "pipe/p_defines.h"
> +#include "util/u_format.h"
> +
> +#include "fd3_format.h"
> +
> +/* convert pipe format to vertex buffer format: */
> +enum a3xx_vtx_fmt
> +fd3_pipe2vtx(enum pipe_format format)
> +{
> + switch (format) {
> + /* 8-bit buffers. */
> + case PIPE_FORMAT_R8_UNORM:
> + return VFMT_NORM_UBYTE_8;
> +
> + case PIPE_FORMAT_R8_SNORM:
> + return VFMT_NORM_BYTE_8;
> +
> + case PIPE_FORMAT_R8_UINT:
> + case PIPE_FORMAT_R8_USCALED:
> + return VFMT_UBYTE_8;
> +
> + case PIPE_FORMAT_R8_SINT:
> + case PIPE_FORMAT_R8_SSCALED:
> + return VFMT_BYTE_8;
> +
> + /* 16-bit buffers. */
> + case PIPE_FORMAT_R16_UNORM:
> + case PIPE_FORMAT_Z16_UNORM:
> + return VFMT_NORM_USHORT_16;
> +
> + case PIPE_FORMAT_R16_SNORM:
> + return VFMT_NORM_SHORT_16;
> +
> + case PIPE_FORMAT_R16_UINT:
> + case PIPE_FORMAT_R16_USCALED:
> + return VFMT_USHORT_16;
> +
> + case PIPE_FORMAT_R16_SINT:
> + case PIPE_FORMAT_R16_SSCALED:
> + return VFMT_SHORT_16;
> +
> + case PIPE_FORMAT_R16_FLOAT:
> + return VFMT_FLOAT_16;
> +
> + case PIPE_FORMAT_R8G8_UNORM:
> + return VFMT_NORM_UBYTE_8_8;
> +
> + case PIPE_FORMAT_R8G8_SNORM:
> + return VFMT_NORM_BYTE_8_8;
> +
> + case PIPE_FORMAT_R8G8_UINT:
> + case PIPE_FORMAT_R8G8_USCALED:
> + return VFMT_UBYTE_8_8;
> +
> + case PIPE_FORMAT_R8G8_SINT:
> + case PIPE_FORMAT_R8G8_SSCALED:
> + return VFMT_BYTE_8_8;
> +
> + /* 24-bit buffers. */
> + case PIPE_FORMAT_R8G8B8_UNORM:
> + return VFMT_NORM_UBYTE_8_8_8;
> +
> + case PIPE_FORMAT_R8G8B8_SNORM:
> + return VFMT_NORM_BYTE_8_8_8;
> +
> + case PIPE_FORMAT_R8G8B8_UINT:
> + case PIPE_FORMAT_R8G8B8_USCALED:
> + return VFMT_UBYTE_8_8_8;
> +
> + case PIPE_FORMAT_R8G8B8_SINT:
> + case PIPE_FORMAT_R8G8B8_SSCALED:
> + return VFMT_BYTE_8_8_8;
> +
> + /* 32-bit buffers. */
> + case PIPE_FORMAT_A8B8G8R8_UNORM:
> + case PIPE_FORMAT_A8R8G8B8_UNORM:
> + case PIPE_FORMAT_B8G8R8A8_UNORM:
> + case PIPE_FORMAT_R8G8B8A8_UNORM:
> + return VFMT_NORM_UBYTE_8_8_8_8;
> +
> + case PIPE_FORMAT_R8G8B8A8_SNORM:
> + return VFMT_NORM_BYTE_8_8_8_8;
> +
> + case PIPE_FORMAT_R8G8B8A8_UINT:
> + case PIPE_FORMAT_R8G8B8A8_USCALED:
> + return VFMT_UBYTE_8_8_8_8;
> +
> + case PIPE_FORMAT_R8G8B8A8_SINT:
> + case PIPE_FORMAT_R8G8B8A8_SSCALED:
> + return VFMT_BYTE_8_8_8_8;
> +
> + case PIPE_FORMAT_R16G16_SSCALED:
> + case PIPE_FORMAT_R16G16_SINT:
> + return VFMT_SHORT_16_16;
> +
> + case PIPE_FORMAT_R16G16_FLOAT:
> + return VFMT_FLOAT_16_16;
> +
> + case PIPE_FORMAT_R16G16_UINT:
> + case PIPE_FORMAT_R16G16_USCALED:
> + return VFMT_USHORT_16_16;
> +
> + case PIPE_FORMAT_R16G16_UNORM:
> + return VFMT_NORM_USHORT_16_16;
> +
> + case PIPE_FORMAT_R16G16_SNORM:
> + return VFMT_NORM_SHORT_16_16;
> +
> + case PIPE_FORMAT_R32_UINT:
> + case PIPE_FORMAT_R32_USCALED:
> + return VFMT_UINT_32;
> +
> + case PIPE_FORMAT_R32_SINT:
> + case PIPE_FORMAT_R32_SSCALED:
> + return VFMT_INT_32;
> +
> + case PIPE_FORMAT_R10G10B10A2_UNORM:
> + return VFMT_NORM_UINT_10_10_10_2;
> +
> + case PIPE_FORMAT_R10G10B10A2_SNORM:
> + return VFMT_NORM_INT_10_10_10_2;
> +
> + case PIPE_FORMAT_R10G10B10A2_UINT:
> + case PIPE_FORMAT_R10G10B10A2_USCALED:
> + return VFMT_UINT_10_10_10_2;
> +
> + case PIPE_FORMAT_R10G10B10A2_SSCALED:
> + return VFMT_INT_10_10_10_2;
> +
> + /* 48-bit buffers. */
> + case PIPE_FORMAT_R16G16B16_FLOAT:
> + return VFMT_FLOAT_16_16_16;
> +
> + case PIPE_FORMAT_R16G16B16_SINT:
> + case PIPE_FORMAT_R16G16B16_SSCALED:
> + return VFMT_SHORT_16_16_16;
> +
> + case PIPE_FORMAT_R16G16B16_UINT:
> + case PIPE_FORMAT_R16G16B16_USCALED:
> + return VFMT_USHORT_16_16_16;
> +
> + case PIPE_FORMAT_R16G16B16_SNORM:
> + return VFMT_NORM_SHORT_16_16_16;
> +
> + case PIPE_FORMAT_R16G16B16_UNORM:
> + return VFMT_NORM_USHORT_16_16_16;
> +
> + case PIPE_FORMAT_R32_FLOAT:
> + case PIPE_FORMAT_Z32_FLOAT:
> + return VFMT_FLOAT_32;
> +
> + case PIPE_FORMAT_R32_FIXED:
> + return VFMT_FIXED_32;
> +
> + /* 64-bit buffers. */
> + case PIPE_FORMAT_R16G16B16A16_UNORM:
> + return VFMT_NORM_USHORT_16_16_16_16;
> +
> + case PIPE_FORMAT_R16G16B16A16_SNORM:
> + return VFMT_NORM_SHORT_16_16_16_16;
> +
> + case PIPE_FORMAT_R16G16B16A16_UINT:
> + case PIPE_FORMAT_R16G16B16A16_USCALED:
> + return VFMT_USHORT_16_16_16_16;
> +
> + case PIPE_FORMAT_R16G16B16A16_SINT:
> + case PIPE_FORMAT_R16G16B16A16_SSCALED:
> + return VFMT_SHORT_16_16_16_16;
> +
> + case PIPE_FORMAT_R32G32_FLOAT:
> + return VFMT_FLOAT_32_32;
> +
> + case PIPE_FORMAT_R32G32_FIXED:
> + return VFMT_FIXED_32_32;
> +
> + case PIPE_FORMAT_R16G16B16A16_FLOAT:
> + return VFMT_FLOAT_16_16_16_16;
> +
> + case PIPE_FORMAT_R32G32_UINT:
> + case PIPE_FORMAT_R32G32_USCALED:
> + return VFMT_UINT_32_32;
> +
> + case PIPE_FORMAT_R32G32_SINT:
> + case PIPE_FORMAT_R32G32_SSCALED:
> + return VFMT_INT_32_32;
> +
> + /* 96-bit buffers. */
> + case PIPE_FORMAT_R32G32B32_FLOAT:
> + return VFMT_FLOAT_32_32_32;
> +
> + case PIPE_FORMAT_R32G32B32_FIXED:
> + return VFMT_FIXED_32_32_32;
> +
> + case PIPE_FORMAT_R32G32B32_UINT:
> + case PIPE_FORMAT_R32G32B32_USCALED:
> + return VFMT_UINT_32_32_32;
> +
> + case PIPE_FORMAT_R32G32B32_SINT:
> + case PIPE_FORMAT_R32G32B32_SSCALED:
> + return VFMT_INT_32_32_32;
> +
> + /* 128-bit buffers. */
> + case PIPE_FORMAT_R32G32B32A32_FLOAT:
> + return VFMT_FLOAT_32_32_32_32;
> +
> + case PIPE_FORMAT_R32G32B32A32_FIXED:
> + return VFMT_FIXED_32_32_32_32;
> +
> + case PIPE_FORMAT_R32G32B32A32_UINT:
> + case PIPE_FORMAT_R32G32B32A32_USCALED:
> + return VFMT_UINT_32_32_32_32;
> +
> + case PIPE_FORMAT_R32G32B32A32_SINT:
> + case PIPE_FORMAT_R32G32B32A32_SSCALED:
> + return VFMT_INT_32_32_32_32;
> +
> +/* TODO normalized 32bit int formats do not appear to be supported
> + * natively.. will require either shader variant or VFD_DECODE
> + * gymnastics like the blob driver does..
> + case PIPE_FORMAT_R32G32B32A32_SNORM:
> + case PIPE_FORMAT_R32G32B32A32_UNORM:
> + */
> +
> + default:
> + return ~0;
> + }
> +}
> +
> +/* convert pipe format to texture sampler format: */
> +enum a3xx_tex_fmt
> +fd3_pipe2tex(enum pipe_format format)
> +{
> + switch (format) {
> + case PIPE_FORMAT_L8_UNORM:
> + case PIPE_FORMAT_A8_UNORM:
> + case PIPE_FORMAT_I8_UNORM:
> + return TFMT_NORM_UINT_8;
> +
> + case PIPE_FORMAT_R8G8_UNORM:
> + return TFMT_NORM_UINT_8_8;
> +
> + case PIPE_FORMAT_B8G8R8A8_UNORM:
> + case PIPE_FORMAT_B8G8R8X8_UNORM:
> + case PIPE_FORMAT_R8G8B8A8_UNORM:
> + case PIPE_FORMAT_R8G8B8X8_UNORM:
> + case PIPE_FORMAT_B8G8R8A8_SRGB:
> + case PIPE_FORMAT_B8G8R8X8_SRGB:
> + case PIPE_FORMAT_R8G8B8A8_SRGB:
> + case PIPE_FORMAT_R8G8B8X8_SRGB:
> + return TFMT_NORM_UINT_8_8_8_8;
> +
> + case PIPE_FORMAT_Z24X8_UNORM:
> + case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> + return TFMT_NORM_UINT_X8Z24;
> +
> + case PIPE_FORMAT_Z16_UNORM:
> + return TFMT_NORM_USHORT_Z16;
> +
> + case PIPE_FORMAT_R16G16B16A16_FLOAT:
> + case PIPE_FORMAT_R16G16B16X16_FLOAT:
> + return TFMT_FLOAT_16_16_16_16;
> +
> + case PIPE_FORMAT_R32G32B32A32_FLOAT:
> + case PIPE_FORMAT_R32G32B32X32_FLOAT:
> + return TFMT_FLOAT_32_32_32_32;
> +
> + // TODO add more..
> +
> + default:
> + return ~0;
> + }
> +}
> +
> +enum a3xx_tex_fetchsize
> +fd3_pipe2fetchsize(enum pipe_format format)
> +{
> + switch (format) {
> + case PIPE_FORMAT_L8_UNORM:
> + case PIPE_FORMAT_A8_UNORM:
> + case PIPE_FORMAT_I8_UNORM:
> + return TFETCH_1_BYTE;
> +
> + case PIPE_FORMAT_Z16_UNORM:
> + return TFETCH_2_BYTE;
> +
> + case PIPE_FORMAT_B8G8R8A8_UNORM:
> + case PIPE_FORMAT_B8G8R8X8_UNORM:
> + case PIPE_FORMAT_R8G8B8A8_UNORM:
> + case PIPE_FORMAT_R8G8B8X8_UNORM:
> + case PIPE_FORMAT_B8G8R8A8_SRGB:
> + case PIPE_FORMAT_B8G8R8X8_SRGB:
> + case PIPE_FORMAT_R8G8B8A8_SRGB:
> + case PIPE_FORMAT_R8G8B8X8_SRGB:
> + case PIPE_FORMAT_Z24X8_UNORM:
> + case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> + return TFETCH_4_BYTE;
> +
> + // TODO add more..
> +
> + default:
> + return TFETCH_DISABLE; /* safe default */
> + }
> +}
> +
> +/* convert pipe format to MRT / copydest format used for render-target: */
> +enum a3xx_color_fmt
> +fd3_pipe2color(enum pipe_format format)
> +{
> + switch (format) {
> + case PIPE_FORMAT_B8G8R8A8_UNORM:
> + case PIPE_FORMAT_B8G8R8X8_UNORM:
> + case PIPE_FORMAT_R8G8B8A8_UNORM:
> + return RB_R8G8B8A8_UNORM;
> +
> + case PIPE_FORMAT_Z16_UNORM:
> + return RB_R8G8_UNORM;
> +
> + case PIPE_FORMAT_Z24X8_UNORM:
> + case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> + /* for DEPTHX_24_8, blob driver also seems to use R8G8B8A8 fmt.. */
> + return RB_R8G8B8A8_UNORM;
> +
> + case PIPE_FORMAT_R8_UNORM:
> + case PIPE_FORMAT_L8_UNORM:
> + return RB_R8_UNORM;
> +
> + case PIPE_FORMAT_A8_UNORM:
> + return RB_A8_UNORM;
> +
> + case PIPE_FORMAT_R16G16B16A16_FLOAT:
> + case PIPE_FORMAT_R16G16B16X16_FLOAT:
> + return RB_R16G16B16A16_FLOAT;
> +
> + case PIPE_FORMAT_R32G32B32A32_FLOAT:
> + case PIPE_FORMAT_R32G32B32X32_FLOAT:
> + return RB_R32G32B32A32_FLOAT;
> +
> + // TODO add more..
> +
> + default:
> + return ~0;
> + }
> +}
> +
> +/* we need to special case a bit the depth/stencil restore, because we are
> + * using the texture sampler to blit into the depth/stencil buffer, *not*
> + * into a color buffer. Otherwise fd3_tex_swiz() will do the wrong thing,
> + * as it is assuming that you are sampling into normal render target..
> + */
> +enum pipe_format
> +fd3_gmem_restore_format(enum pipe_format format)
> +{
> + switch (format) {
> + case PIPE_FORMAT_Z24X8_UNORM:
> + case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> + return PIPE_FORMAT_R8G8B8A8_UNORM;
> + case PIPE_FORMAT_Z16_UNORM:
> + return PIPE_FORMAT_R8G8_UNORM;
> + default:
> + return format;
> + }
> +}
> +
> +enum a3xx_color_swap
> +fd3_pipe2swap(enum pipe_format format)
> +{
> + switch (format) {
> + case PIPE_FORMAT_B8G8R8A8_UNORM:
> + case PIPE_FORMAT_B8G8R8X8_UNORM:
> + case PIPE_FORMAT_B8G8R8A8_SRGB:
> + case PIPE_FORMAT_B8G8R8X8_SRGB:
> + return WXYZ;
> +
> + case PIPE_FORMAT_A8R8G8B8_UNORM:
> + case PIPE_FORMAT_X8R8G8B8_UNORM:
> + case PIPE_FORMAT_A8R8G8B8_SRGB:
> + case PIPE_FORMAT_X8R8G8B8_SRGB:
> + return ZYXW;
> +
> + case PIPE_FORMAT_A8B8G8R8_UNORM:
> + case PIPE_FORMAT_X8B8G8R8_UNORM:
> + case PIPE_FORMAT_A8B8G8R8_SRGB:
> + case PIPE_FORMAT_X8B8G8R8_SRGB:
> + return XYZW;
> +
> + case PIPE_FORMAT_R8G8B8A8_UNORM:
> + case PIPE_FORMAT_R8G8B8X8_UNORM:
> + case PIPE_FORMAT_Z24X8_UNORM:
> + case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> + default:
> + return WZYX;
> + }
> +}
> +
> +static inline enum a3xx_tex_swiz
> +tex_swiz(unsigned swiz)
> +{
> + switch (swiz) {
> + default:
> + case PIPE_SWIZZLE_RED: return A3XX_TEX_X;
> + case PIPE_SWIZZLE_GREEN: return A3XX_TEX_Y;
> + case PIPE_SWIZZLE_BLUE: return A3XX_TEX_Z;
> + case PIPE_SWIZZLE_ALPHA: return A3XX_TEX_W;
> + case PIPE_SWIZZLE_ZERO: return A3XX_TEX_ZERO;
> + case PIPE_SWIZZLE_ONE: return A3XX_TEX_ONE;
> + }
> +}
> +
> +uint32_t
> +fd3_tex_swiz(enum pipe_format format, unsigned swizzle_r, unsigned swizzle_g,
> + unsigned swizzle_b, unsigned swizzle_a)
> +{
> + const struct util_format_description *desc =
> + util_format_description(format);
> + unsigned char swiz[4] = {
> + swizzle_r, swizzle_g, swizzle_b, swizzle_a,
> + }, rswiz[4];
> +
> + util_format_compose_swizzles(desc->swizzle, swiz, rswiz);
> +
> + return A3XX_TEX_CONST_0_SWIZ_X(tex_swiz(rswiz[0])) |
> + A3XX_TEX_CONST_0_SWIZ_Y(tex_swiz(rswiz[1])) |
> + A3XX_TEX_CONST_0_SWIZ_Z(tex_swiz(rswiz[2])) |
> + A3XX_TEX_CONST_0_SWIZ_W(tex_swiz(rswiz[3]));
> +}
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_format.h b/src/gallium/drivers/freedreno/a3xx/fd3_format.h
> new file mode 100644
> index 0000000..ebd6795
> --- /dev/null
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.h
> @@ -0,0 +1,42 @@
> +/*
> + * Copyright (C) 2013 Rob Clark <robclark at freedesktop.org>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> + * SOFTWARE.
> + *
> + */
> +
> +#ifndef FD3_FORMAT_H_
> +#define FD3_FORMAT_H_
> +
> +#include "freedreno_util.h"
> +
> +#include "a3xx.xml.h"
> +
> +enum a3xx_vtx_fmt fd3_pipe2vtx(enum pipe_format format);
> +enum a3xx_tex_fmt fd3_pipe2tex(enum pipe_format format);
> +enum a3xx_tex_fetchsize fd3_pipe2fetchsize(enum pipe_format format);
> +enum a3xx_color_fmt fd3_pipe2color(enum pipe_format format);
> +enum pipe_format fd3_gmem_restore_format(enum pipe_format format);
> +enum a3xx_color_swap fd3_pipe2swap(enum pipe_format format);
> +
> +uint32_t fd3_tex_swiz(enum pipe_format format, unsigned swizzle_r,
> + unsigned swizzle_g, unsigned swizzle_b, unsigned swizzle_a);
> +
> +#endif /* FD3_FORMAT_H_ */
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
> index f454db2..1dd43cc 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
> @@ -40,7 +40,7 @@
> #include "fd3_context.h"
> #include "fd3_emit.h"
> #include "fd3_program.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
> #include "fd3_zsa.h"
>
> static const struct ir3_shader_key key = {
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_program.c b/src/gallium/drivers/freedreno/a3xx/fd3_program.c
> index cb0179a..b671095 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_program.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_program.c
> @@ -39,7 +39,7 @@
> #include "fd3_program.h"
> #include "fd3_emit.h"
> #include "fd3_texture.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
>
> static void
> delete_shader_stateobj(struct fd3_shader_stateobj *so)
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_query.c b/src/gallium/drivers/freedreno/a3xx/fd3_query.c
> index bc3a3ec..cf70ae3 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_query.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_query.c
> @@ -31,7 +31,7 @@
> #include "freedreno_util.h"
>
> #include "fd3_query.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
>
>
> struct fd_rb_samp_ctrs {
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c b/src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c
> index 1a1a7cb..4b926b5 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c
> @@ -33,7 +33,7 @@
>
> #include "fd3_rasterizer.h"
> #include "fd3_context.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
>
> void *
> fd3_rasterizer_state_create(struct pipe_context *pctx,
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_screen.c b/src/gallium/drivers/freedreno/a3xx/fd3_screen.c
> index 9bb19ab..3871660 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_screen.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_screen.c
> @@ -31,7 +31,7 @@
>
> #include "fd3_screen.h"
> #include "fd3_context.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
>
> static boolean
> fd3_screen_is_format_supported(struct pipe_screen *pscreen,
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
> index 39befef..5dda82d 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
> @@ -33,7 +33,7 @@
> #include "util/u_format.h"
>
> #include "fd3_texture.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
>
> static enum a3xx_tex_clamp
> tex_clamp(unsigned wrap, bool clamp_to_edge)
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_texture.h b/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
> index 0434df3..f3cb120 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_texture.h
> @@ -35,7 +35,7 @@
> #include "freedreno_resource.h"
>
> #include "fd3_context.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
>
> struct fd3_sampler_stateobj {
> struct pipe_sampler_state base;
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_util.c b/src/gallium/drivers/freedreno/a3xx/fd3_util.c
> deleted file mode 100644
> index a73894f..0000000
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_util.c
> +++ /dev/null
> @@ -1,453 +0,0 @@
> -/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
> -
> -/*
> - * Copyright (C) 2013 Rob Clark <robclark at freedesktop.org>
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the next
> - * paragraph) shall be included in all copies or substantial portions of the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> - * SOFTWARE.
> - *
> - * Authors:
> - * Rob Clark <robclark at freedesktop.org>
> - */
> -
> -#include "pipe/p_defines.h"
> -#include "util/u_format.h"
> -
> -#include "fd3_util.h"
> -
> -/* convert pipe format to vertex buffer format: */
> -enum a3xx_vtx_fmt
> -fd3_pipe2vtx(enum pipe_format format)
> -{
> - switch (format) {
> - /* 8-bit buffers. */
> - case PIPE_FORMAT_R8_UNORM:
> - return VFMT_NORM_UBYTE_8;
> -
> - case PIPE_FORMAT_R8_SNORM:
> - return VFMT_NORM_BYTE_8;
> -
> - case PIPE_FORMAT_R8_UINT:
> - case PIPE_FORMAT_R8_USCALED:
> - return VFMT_UBYTE_8;
> -
> - case PIPE_FORMAT_R8_SINT:
> - case PIPE_FORMAT_R8_SSCALED:
> - return VFMT_BYTE_8;
> -
> - /* 16-bit buffers. */
> - case PIPE_FORMAT_R16_UNORM:
> - case PIPE_FORMAT_Z16_UNORM:
> - return VFMT_NORM_USHORT_16;
> -
> - case PIPE_FORMAT_R16_SNORM:
> - return VFMT_NORM_SHORT_16;
> -
> - case PIPE_FORMAT_R16_UINT:
> - case PIPE_FORMAT_R16_USCALED:
> - return VFMT_USHORT_16;
> -
> - case PIPE_FORMAT_R16_SINT:
> - case PIPE_FORMAT_R16_SSCALED:
> - return VFMT_SHORT_16;
> -
> - case PIPE_FORMAT_R16_FLOAT:
> - return VFMT_FLOAT_16;
> -
> - case PIPE_FORMAT_R8G8_UNORM:
> - return VFMT_NORM_UBYTE_8_8;
> -
> - case PIPE_FORMAT_R8G8_SNORM:
> - return VFMT_NORM_BYTE_8_8;
> -
> - case PIPE_FORMAT_R8G8_UINT:
> - case PIPE_FORMAT_R8G8_USCALED:
> - return VFMT_UBYTE_8_8;
> -
> - case PIPE_FORMAT_R8G8_SINT:
> - case PIPE_FORMAT_R8G8_SSCALED:
> - return VFMT_BYTE_8_8;
> -
> - /* 24-bit buffers. */
> - case PIPE_FORMAT_R8G8B8_UNORM:
> - return VFMT_NORM_UBYTE_8_8_8;
> -
> - case PIPE_FORMAT_R8G8B8_SNORM:
> - return VFMT_NORM_BYTE_8_8_8;
> -
> - case PIPE_FORMAT_R8G8B8_UINT:
> - case PIPE_FORMAT_R8G8B8_USCALED:
> - return VFMT_UBYTE_8_8_8;
> -
> - case PIPE_FORMAT_R8G8B8_SINT:
> - case PIPE_FORMAT_R8G8B8_SSCALED:
> - return VFMT_BYTE_8_8_8;
> -
> - /* 32-bit buffers. */
> - case PIPE_FORMAT_A8B8G8R8_UNORM:
> - case PIPE_FORMAT_A8R8G8B8_UNORM:
> - case PIPE_FORMAT_B8G8R8A8_UNORM:
> - case PIPE_FORMAT_R8G8B8A8_UNORM:
> - return VFMT_NORM_UBYTE_8_8_8_8;
> -
> - case PIPE_FORMAT_R8G8B8A8_SNORM:
> - return VFMT_NORM_BYTE_8_8_8_8;
> -
> - case PIPE_FORMAT_R8G8B8A8_UINT:
> - case PIPE_FORMAT_R8G8B8A8_USCALED:
> - return VFMT_UBYTE_8_8_8_8;
> -
> - case PIPE_FORMAT_R8G8B8A8_SINT:
> - case PIPE_FORMAT_R8G8B8A8_SSCALED:
> - return VFMT_BYTE_8_8_8_8;
> -
> - case PIPE_FORMAT_R16G16_SSCALED:
> - case PIPE_FORMAT_R16G16_SINT:
> - return VFMT_SHORT_16_16;
> -
> - case PIPE_FORMAT_R16G16_FLOAT:
> - return VFMT_FLOAT_16_16;
> -
> - case PIPE_FORMAT_R16G16_UINT:
> - case PIPE_FORMAT_R16G16_USCALED:
> - return VFMT_USHORT_16_16;
> -
> - case PIPE_FORMAT_R16G16_UNORM:
> - return VFMT_NORM_USHORT_16_16;
> -
> - case PIPE_FORMAT_R16G16_SNORM:
> - return VFMT_NORM_SHORT_16_16;
> -
> - case PIPE_FORMAT_R32_UINT:
> - case PIPE_FORMAT_R32_USCALED:
> - return VFMT_UINT_32;
> -
> - case PIPE_FORMAT_R32_SINT:
> - case PIPE_FORMAT_R32_SSCALED:
> - return VFMT_INT_32;
> -
> - case PIPE_FORMAT_R10G10B10A2_UNORM:
> - return VFMT_NORM_UINT_10_10_10_2;
> -
> - case PIPE_FORMAT_R10G10B10A2_SNORM:
> - return VFMT_NORM_INT_10_10_10_2;
> -
> - case PIPE_FORMAT_R10G10B10A2_UINT:
> - case PIPE_FORMAT_R10G10B10A2_USCALED:
> - return VFMT_UINT_10_10_10_2;
> -
> - case PIPE_FORMAT_R10G10B10A2_SSCALED:
> - return VFMT_INT_10_10_10_2;
> -
> - /* 48-bit buffers. */
> - case PIPE_FORMAT_R16G16B16_FLOAT:
> - return VFMT_FLOAT_16_16_16;
> -
> - case PIPE_FORMAT_R16G16B16_SINT:
> - case PIPE_FORMAT_R16G16B16_SSCALED:
> - return VFMT_SHORT_16_16_16;
> -
> - case PIPE_FORMAT_R16G16B16_UINT:
> - case PIPE_FORMAT_R16G16B16_USCALED:
> - return VFMT_USHORT_16_16_16;
> -
> - case PIPE_FORMAT_R16G16B16_SNORM:
> - return VFMT_NORM_SHORT_16_16_16;
> -
> - case PIPE_FORMAT_R16G16B16_UNORM:
> - return VFMT_NORM_USHORT_16_16_16;
> -
> - case PIPE_FORMAT_R32_FLOAT:
> - case PIPE_FORMAT_Z32_FLOAT:
> - return VFMT_FLOAT_32;
> -
> - case PIPE_FORMAT_R32_FIXED:
> - return VFMT_FIXED_32;
> -
> - /* 64-bit buffers. */
> - case PIPE_FORMAT_R16G16B16A16_UNORM:
> - return VFMT_NORM_USHORT_16_16_16_16;
> -
> - case PIPE_FORMAT_R16G16B16A16_SNORM:
> - return VFMT_NORM_SHORT_16_16_16_16;
> -
> - case PIPE_FORMAT_R16G16B16A16_UINT:
> - case PIPE_FORMAT_R16G16B16A16_USCALED:
> - return VFMT_USHORT_16_16_16_16;
> -
> - case PIPE_FORMAT_R16G16B16A16_SINT:
> - case PIPE_FORMAT_R16G16B16A16_SSCALED:
> - return VFMT_SHORT_16_16_16_16;
> -
> - case PIPE_FORMAT_R32G32_FLOAT:
> - return VFMT_FLOAT_32_32;
> -
> - case PIPE_FORMAT_R32G32_FIXED:
> - return VFMT_FIXED_32_32;
> -
> - case PIPE_FORMAT_R16G16B16A16_FLOAT:
> - return VFMT_FLOAT_16_16_16_16;
> -
> - case PIPE_FORMAT_R32G32_UINT:
> - case PIPE_FORMAT_R32G32_USCALED:
> - return VFMT_UINT_32_32;
> -
> - case PIPE_FORMAT_R32G32_SINT:
> - case PIPE_FORMAT_R32G32_SSCALED:
> - return VFMT_INT_32_32;
> -
> - /* 96-bit buffers. */
> - case PIPE_FORMAT_R32G32B32_FLOAT:
> - return VFMT_FLOAT_32_32_32;
> -
> - case PIPE_FORMAT_R32G32B32_FIXED:
> - return VFMT_FIXED_32_32_32;
> -
> - case PIPE_FORMAT_R32G32B32_UINT:
> - case PIPE_FORMAT_R32G32B32_USCALED:
> - return VFMT_UINT_32_32_32;
> -
> - case PIPE_FORMAT_R32G32B32_SINT:
> - case PIPE_FORMAT_R32G32B32_SSCALED:
> - return VFMT_INT_32_32_32;
> -
> - /* 128-bit buffers. */
> - case PIPE_FORMAT_R32G32B32A32_FLOAT:
> - return VFMT_FLOAT_32_32_32_32;
> -
> - case PIPE_FORMAT_R32G32B32A32_FIXED:
> - return VFMT_FIXED_32_32_32_32;
> -
> - case PIPE_FORMAT_R32G32B32A32_UINT:
> - case PIPE_FORMAT_R32G32B32A32_USCALED:
> - return VFMT_UINT_32_32_32_32;
> -
> - case PIPE_FORMAT_R32G32B32A32_SINT:
> - case PIPE_FORMAT_R32G32B32A32_SSCALED:
> - return VFMT_INT_32_32_32_32;
> -
> -/* TODO normalized 32bit int formats do not appear to be supported
> - * natively.. will require either shader variant or VFD_DECODE
> - * gymnastics like the blob driver does..
> - case PIPE_FORMAT_R32G32B32A32_SNORM:
> - case PIPE_FORMAT_R32G32B32A32_UNORM:
> - */
> -
> - default:
> - return ~0;
> - }
> -}
> -
> -/* convert pipe format to texture sampler format: */
> -enum a3xx_tex_fmt
> -fd3_pipe2tex(enum pipe_format format)
> -{
> - switch (format) {
> - case PIPE_FORMAT_L8_UNORM:
> - case PIPE_FORMAT_A8_UNORM:
> - case PIPE_FORMAT_I8_UNORM:
> - return TFMT_NORM_UINT_8;
> -
> - case PIPE_FORMAT_R8G8_UNORM:
> - return TFMT_NORM_UINT_8_8;
> -
> - case PIPE_FORMAT_B8G8R8A8_UNORM:
> - case PIPE_FORMAT_B8G8R8X8_UNORM:
> - case PIPE_FORMAT_R8G8B8A8_UNORM:
> - case PIPE_FORMAT_R8G8B8X8_UNORM:
> - case PIPE_FORMAT_B8G8R8A8_SRGB:
> - case PIPE_FORMAT_B8G8R8X8_SRGB:
> - case PIPE_FORMAT_R8G8B8A8_SRGB:
> - case PIPE_FORMAT_R8G8B8X8_SRGB:
> - return TFMT_NORM_UINT_8_8_8_8;
> -
> - case PIPE_FORMAT_Z24X8_UNORM:
> - case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> - return TFMT_NORM_UINT_X8Z24;
> -
> - case PIPE_FORMAT_Z16_UNORM:
> - return TFMT_NORM_USHORT_Z16;
> -
> - case PIPE_FORMAT_R16G16B16A16_FLOAT:
> - case PIPE_FORMAT_R16G16B16X16_FLOAT:
> - return TFMT_FLOAT_16_16_16_16;
> -
> - case PIPE_FORMAT_R32G32B32A32_FLOAT:
> - case PIPE_FORMAT_R32G32B32X32_FLOAT:
> - return TFMT_FLOAT_32_32_32_32;
> -
> - // TODO add more..
> -
> - default:
> - return ~0;
> - }
> -}
> -
> -enum a3xx_tex_fetchsize
> -fd3_pipe2fetchsize(enum pipe_format format)
> -{
> - switch (format) {
> - case PIPE_FORMAT_L8_UNORM:
> - case PIPE_FORMAT_A8_UNORM:
> - case PIPE_FORMAT_I8_UNORM:
> - return TFETCH_1_BYTE;
> -
> - case PIPE_FORMAT_Z16_UNORM:
> - return TFETCH_2_BYTE;
> -
> - case PIPE_FORMAT_B8G8R8A8_UNORM:
> - case PIPE_FORMAT_B8G8R8X8_UNORM:
> - case PIPE_FORMAT_R8G8B8A8_UNORM:
> - case PIPE_FORMAT_R8G8B8X8_UNORM:
> - case PIPE_FORMAT_B8G8R8A8_SRGB:
> - case PIPE_FORMAT_B8G8R8X8_SRGB:
> - case PIPE_FORMAT_R8G8B8A8_SRGB:
> - case PIPE_FORMAT_R8G8B8X8_SRGB:
> - case PIPE_FORMAT_Z24X8_UNORM:
> - case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> - return TFETCH_4_BYTE;
> -
> - // TODO add more..
> -
> - default:
> - return TFETCH_DISABLE; /* safe default */
> - }
> -}
> -
> -/* convert pipe format to MRT / copydest format used for render-target: */
> -enum a3xx_color_fmt
> -fd3_pipe2color(enum pipe_format format)
> -{
> - switch (format) {
> - case PIPE_FORMAT_B8G8R8A8_UNORM:
> - case PIPE_FORMAT_B8G8R8X8_UNORM:
> - case PIPE_FORMAT_R8G8B8A8_UNORM:
> - return RB_R8G8B8A8_UNORM;
> -
> - case PIPE_FORMAT_Z16_UNORM:
> - return RB_R8G8_UNORM;
> -
> - case PIPE_FORMAT_Z24X8_UNORM:
> - case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> - /* for DEPTHX_24_8, blob driver also seems to use R8G8B8A8 fmt.. */
> - return RB_R8G8B8A8_UNORM;
> -
> - case PIPE_FORMAT_R8_UNORM:
> - case PIPE_FORMAT_L8_UNORM:
> - return RB_R8_UNORM;
> -
> - case PIPE_FORMAT_A8_UNORM:
> - return RB_A8_UNORM;
> -
> - case PIPE_FORMAT_R16G16B16A16_FLOAT:
> - case PIPE_FORMAT_R16G16B16X16_FLOAT:
> - return RB_R16G16B16A16_FLOAT;
> -
> - case PIPE_FORMAT_R32G32B32A32_FLOAT:
> - case PIPE_FORMAT_R32G32B32X32_FLOAT:
> - return RB_R32G32B32A32_FLOAT;
> -
> - // TODO add more..
> -
> - default:
> - return ~0;
> - }
> -}
> -
> -/* we need to special case a bit the depth/stencil restore, because we are
> - * using the texture sampler to blit into the depth/stencil buffer, *not*
> - * into a color buffer. Otherwise fd3_tex_swiz() will do the wrong thing,
> - * as it is assuming that you are sampling into normal render target..
> - */
> -enum pipe_format
> -fd3_gmem_restore_format(enum pipe_format format)
> -{
> - switch (format) {
> - case PIPE_FORMAT_Z24X8_UNORM:
> - case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> - return PIPE_FORMAT_R8G8B8A8_UNORM;
> - case PIPE_FORMAT_Z16_UNORM:
> - return PIPE_FORMAT_R8G8_UNORM;
> - default:
> - return format;
> - }
> -}
> -
> -enum a3xx_color_swap
> -fd3_pipe2swap(enum pipe_format format)
> -{
> - switch (format) {
> - case PIPE_FORMAT_B8G8R8A8_UNORM:
> - case PIPE_FORMAT_B8G8R8X8_UNORM:
> - case PIPE_FORMAT_B8G8R8A8_SRGB:
> - case PIPE_FORMAT_B8G8R8X8_SRGB:
> - return WXYZ;
> -
> - case PIPE_FORMAT_A8R8G8B8_UNORM:
> - case PIPE_FORMAT_X8R8G8B8_UNORM:
> - case PIPE_FORMAT_A8R8G8B8_SRGB:
> - case PIPE_FORMAT_X8R8G8B8_SRGB:
> - return ZYXW;
> -
> - case PIPE_FORMAT_A8B8G8R8_UNORM:
> - case PIPE_FORMAT_X8B8G8R8_UNORM:
> - case PIPE_FORMAT_A8B8G8R8_SRGB:
> - case PIPE_FORMAT_X8B8G8R8_SRGB:
> - return XYZW;
> -
> - case PIPE_FORMAT_R8G8B8A8_UNORM:
> - case PIPE_FORMAT_R8G8B8X8_UNORM:
> - case PIPE_FORMAT_Z24X8_UNORM:
> - case PIPE_FORMAT_Z24_UNORM_S8_UINT:
> - default:
> - return WZYX;
> - }
> -}
> -
> -static inline enum a3xx_tex_swiz
> -tex_swiz(unsigned swiz)
> -{
> - switch (swiz) {
> - default:
> - case PIPE_SWIZZLE_RED: return A3XX_TEX_X;
> - case PIPE_SWIZZLE_GREEN: return A3XX_TEX_Y;
> - case PIPE_SWIZZLE_BLUE: return A3XX_TEX_Z;
> - case PIPE_SWIZZLE_ALPHA: return A3XX_TEX_W;
> - case PIPE_SWIZZLE_ZERO: return A3XX_TEX_ZERO;
> - case PIPE_SWIZZLE_ONE: return A3XX_TEX_ONE;
> - }
> -}
> -
> -uint32_t
> -fd3_tex_swiz(enum pipe_format format, unsigned swizzle_r, unsigned swizzle_g,
> - unsigned swizzle_b, unsigned swizzle_a)
> -{
> - const struct util_format_description *desc =
> - util_format_description(format);
> - unsigned char swiz[4] = {
> - swizzle_r, swizzle_g, swizzle_b, swizzle_a,
> - }, rswiz[4];
> -
> - util_format_compose_swizzles(desc->swizzle, swiz, rswiz);
> -
> - return A3XX_TEX_CONST_0_SWIZ_X(tex_swiz(rswiz[0])) |
> - A3XX_TEX_CONST_0_SWIZ_Y(tex_swiz(rswiz[1])) |
> - A3XX_TEX_CONST_0_SWIZ_Z(tex_swiz(rswiz[2])) |
> - A3XX_TEX_CONST_0_SWIZ_W(tex_swiz(rswiz[3]));
> -}
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_util.h b/src/gallium/drivers/freedreno/a3xx/fd3_util.h
> deleted file mode 100644
> index 4681840..0000000
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_util.h
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
> -
> -/*
> - * Copyright (C) 2013 Rob Clark <robclark at freedesktop.org>
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the next
> - * paragraph) shall be included in all copies or substantial portions of the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> - * SOFTWARE.
> - *
> - * Authors:
> - * Rob Clark <robclark at freedesktop.org>
> - */
> -
> -#ifndef FD3_UTIL_H_
> -#define FD3_UTIL_H_
> -
> -#include "freedreno_util.h"
> -
> -#include "a3xx.xml.h"
> -
> -enum a3xx_vtx_fmt fd3_pipe2vtx(enum pipe_format format);
> -enum a3xx_tex_fmt fd3_pipe2tex(enum pipe_format format);
> -enum a3xx_tex_fetchsize fd3_pipe2fetchsize(enum pipe_format format);
> -enum a3xx_color_fmt fd3_pipe2color(enum pipe_format format);
> -enum pipe_format fd3_gmem_restore_format(enum pipe_format format);
> -enum a3xx_color_swap fd3_pipe2swap(enum pipe_format format);
> -
> -uint32_t fd3_tex_swiz(enum pipe_format format, unsigned swizzle_r,
> - unsigned swizzle_g, unsigned swizzle_b, unsigned swizzle_a);
> -
> -#endif /* FD3_UTIL_H_ */
> diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_zsa.c b/src/gallium/drivers/freedreno/a3xx/fd3_zsa.c
> index c97cfb7..3947126 100644
> --- a/src/gallium/drivers/freedreno/a3xx/fd3_zsa.c
> +++ b/src/gallium/drivers/freedreno/a3xx/fd3_zsa.c
> @@ -33,7 +33,7 @@
>
> #include "fd3_zsa.h"
> #include "fd3_context.h"
> -#include "fd3_util.h"
> +#include "fd3_format.h"
>
> void *
> fd3_zsa_state_create(struct pipe_context *pctx,
> --
> 2.0.4
>
More information about the Freedreno
mailing list