freedreno/a4xx: fix *_NONE enum conversion

[mesa.git] / src / gallium / drivers / freedreno / a4xx / fd4_format.c

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_format.c b/src/gallium/drivers/freedreno/a4xx/fd4_format.c
index c240745cec14472f860d8f0f9ce74eb47f3531ee..3e7fff51743102f47f9d04957302cd53da403437 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_format.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_format.c
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
-
 /*
  * Copyright (C) 2014 Rob Clark <robclark@freedesktop.org>
  *
@@ -27,7 +25,7 @@
  */
 
 #include "pipe/p_defines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd4_format.h"
 
@@ -44,8 +42,6 @@ struct fd4_format {
        boolean present;
 };
 
-#define RB4_NONE ~0
-
 /* vertex + texture */
 #define VT(pipe, fmt, rbfmt, swapfmt) \
        [PIPE_FORMAT_ ## pipe] = { \
@@ -60,7 +56,7 @@ struct fd4_format {
 #define _T(pipe, fmt, rbfmt, swapfmt) \
        [PIPE_FORMAT_ ## pipe] = { \
                .present = 1, \
-               .vtx = ~0, \
+               .vtx = VFMT4_NONE, \
                .tex = TFMT4_ ## fmt, \
                .rb = RB4_ ## rbfmt, \
                .swap = swapfmt \
@@ -71,7 +67,7 @@ struct fd4_format {
        [PIPE_FORMAT_ ## pipe] = { \
                .present = 1, \
                .vtx = VFMT4_ ## fmt, \
-               .tex = ~0, \
+               .tex = TFMT4_NONE, \
                .rb = RB4_ ## rbfmt, \
                .swap = swapfmt \
        }
@@ -79,11 +75,11 @@ struct fd4_format {
 static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        /* 8-bit */
        VT(R8_UNORM,   8_UNORM, R8_UNORM, WZYX),
-       VT(R8_SNORM,   8_SNORM, NONE,     WZYX),
-       VT(R8_UINT,    8_UINT,  NONE,     WZYX),
-       VT(R8_SINT,    8_SINT,  NONE,     WZYX),
+       VT(R8_SNORM,   8_SNORM, R8_SNORM, WZYX),
+       VT(R8_UINT,    8_UINT,  R8_UINT,  WZYX),
+       VT(R8_SINT,    8_SINT,  R8_SINT,  WZYX),
        V_(R8_USCALED, 8_UINT,  NONE,     WZYX),
-       V_(R8_SSCALED, 8_UINT,  NONE,     WZYX),
+       V_(R8_SSCALED, 8_SINT,  NONE,     WZYX),
 
        _T(A8_UNORM,   8_UNORM, A8_UNORM, WZYX),
        _T(L8_UNORM,   8_UNORM, R8_UNORM, WZYX),
@@ -104,7 +100,7 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        VT(R16_UINT,    16_UINT,  R16_UINT,  WZYX),
        VT(R16_SINT,    16_SINT,  R16_SINT,  WZYX),
        V_(R16_USCALED, 16_UINT,  NONE,      WZYX),
-       V_(R16_SSCALED, 16_UINT,  NONE,      WZYX),
+       V_(R16_SSCALED, 16_SINT,  NONE,      WZYX),
        VT(R16_FLOAT,   16_FLOAT, R16_FLOAT, WZYX),
 
        _T(A16_UNORM,   16_UNORM, NONE,      WZYX),
@@ -147,7 +143,7 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        VT(R32_UINT,    32_UINT,  R32_UINT, WZYX),
        VT(R32_SINT,    32_SINT,  R32_SINT, WZYX),
        V_(R32_USCALED, 32_UINT,  NONE,     WZYX),
-       V_(R32_SSCALED, 32_UINT,  NONE,     WZYX),
+       V_(R32_SSCALED, 32_SINT,  NONE,     WZYX),
        VT(R32_FLOAT,   32_FLOAT, R32_FLOAT,WZYX),
        V_(R32_FIXED,   32_FIXED, NONE,     WZYX),
 
@@ -211,10 +207,13 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        VT(R11G11B10_FLOAT, 11_11_10_FLOAT, R11G11B10_FLOAT, WZYX),
        _T(R9G9B9E5_FLOAT,  9_9_9_E5_FLOAT, NONE,            WZYX),
 
-       _T(Z24X8_UNORM,       X8Z24_UNORM, R8G8B8A8_UNORM, WZYX),
-       _T(Z24_UNORM_S8_UINT, X8Z24_UNORM, R8G8B8A8_UNORM, WZYX),
-       _T(Z32_FLOAT,         32_FLOAT,   R8G8B8A8_UNORM, WZYX),
-       _T(Z32_FLOAT_S8X24_UINT, 32_FLOAT,R8G8B8A8_UNORM, WZYX),
+       _T(Z16_UNORM,            16_UNORM,     R8G8_UNORM,     WZYX),
+       _T(Z24X8_UNORM,          X8Z24_UNORM,  R8G8B8A8_UNORM, WZYX),
+       _T(X24S8_UINT,           8_8_8_8_UINT, R8G8B8A8_UINT,  XYZW),
+       _T(Z24_UNORM_S8_UINT,    X8Z24_UNORM,  R8G8B8A8_UNORM, WZYX),
+       _T(Z32_FLOAT,            32_FLOAT,     R8G8B8A8_UNORM, WZYX),
+       _T(Z32_FLOAT_S8X24_UINT, 32_FLOAT,     R8G8B8A8_UNORM, WZYX),
+       _T(X32_S8X24_UINT,       8_UINT,       R8_UINT,        WZYX),
 
        /* 48-bit */
        V_(R16G16B16_UNORM,   16_16_16_UNORM, NONE, WZYX),
@@ -340,7 +339,7 @@ enum a4xx_vtx_fmt
 fd4_pipe2vtx(enum pipe_format format)
 {
        if (!formats[format].present)
-               return ~0;
+               return VFMT4_NONE;
        return formats[format].vtx;
 }
 
@@ -349,7 +348,7 @@ enum a4xx_tex_fmt
 fd4_pipe2tex(enum pipe_format format)
 {
        if (!formats[format].present)
-               return ~0;
+               return TFMT4_NONE;
        return formats[format].tex;
 }
 
@@ -358,7 +357,7 @@ enum a4xx_color_fmt
 fd4_pipe2color(enum pipe_format format)
 {
        if (!formats[format].present)
-               return ~0;
+               return RB4_NONE;
        return formats[format].rb;
 }
 
@@ -394,29 +393,6 @@ fd4_pipe2fetchsize(enum pipe_format format)
        }
 }
 
-/* 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 fd4_tex_swiz() will do the wrong thing,
- * as it is assuming that you are sampling into normal render target..
- *
- * TODO looks like we can probably share w/ a3xx..
- */
-enum pipe_format
-fd4_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;
-       case PIPE_FORMAT_S8_UINT:
-               return PIPE_FORMAT_R8_UNORM;
-       default:
-               return format;
-       }
-}
-
 enum a4xx_depth_format
 fd4_pipe2depth(enum pipe_format format)
 {
@@ -441,12 +417,12 @@ tex_swiz(unsigned swiz)
 {
        switch (swiz) {
        default:
-       case PIPE_SWIZZLE_RED:   return A4XX_TEX_X;
-       case PIPE_SWIZZLE_GREEN: return A4XX_TEX_Y;
-       case PIPE_SWIZZLE_BLUE:  return A4XX_TEX_Z;
-       case PIPE_SWIZZLE_ALPHA: return A4XX_TEX_W;
-       case PIPE_SWIZZLE_ZERO:  return A4XX_TEX_ZERO;
-       case PIPE_SWIZZLE_ONE:   return A4XX_TEX_ONE;
+       case PIPE_SWIZZLE_X: return A4XX_TEX_X;
+       case PIPE_SWIZZLE_Y: return A4XX_TEX_Y;
+       case PIPE_SWIZZLE_Z: return A4XX_TEX_Z;
+       case PIPE_SWIZZLE_W: return A4XX_TEX_W;
+       case PIPE_SWIZZLE_0: return A4XX_TEX_ZERO;
+       case PIPE_SWIZZLE_1: return A4XX_TEX_ONE;
        }
 }