mesa: Redefine the RG formats as array formats.

This is the layout used in the GL API, and maps directly to PIPE
formats with no endianness trickery.  As with the LA change, this
fixes big-endian fetching from texbos.  Also cleans up some endian
shenanigans in shader images.

Reviewed-by: Marek Olšák <[email protected]>

3 files changed, 10 insertions, 10 deletions

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 28a01d33405..749b9a36fb5 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -932,11 +932,11 @@ static const struct {
       .image_format = __DRI_IMAGE_FORMAT_R8,
       .mesa_format  =        MESA_FORMAT_L_UNORM8,
    },
+#ifdef PIPE_ARCH_LITTLE_ENDIAN
    {
       .image_format = __DRI_IMAGE_FORMAT_GR88,
-      .mesa_format  =        MESA_FORMAT_R8G8_UNORM,
+      .mesa_format  =        MESA_FORMAT_RG_UNORM8,
    },
-#ifdef PIPE_ARCH_LITTLE_ENDIAN
    {
       .image_format = __DRI_IMAGE_FORMAT_GR88,
       .mesa_format  =        MESA_FORMAT_LA_UNORM8,
@@ -958,11 +958,11 @@ static const struct {
       .image_format = __DRI_IMAGE_FORMAT_R16,
       .mesa_format  =        MESA_FORMAT_L_UNORM16,
    },
+#ifdef PIPE_ARCH_LITTLE_ENDIAN
    {
       .image_format = __DRI_IMAGE_FORMAT_GR1616,
-      .mesa_format  =        MESA_FORMAT_R16G16_UNORM,
+      .mesa_format  =        MESA_FORMAT_RG_UNORM16,
    },
-#ifdef PIPE_ARCH_LITTLE_ENDIAN
    {
       .image_format = __DRI_IMAGE_FORMAT_GR1616,
       .mesa_format  =        MESA_FORMAT_LA_UNORM16,
diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
index 6127ed8a490..b42bbf870b6 100644
--- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
+++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
@@ -58,9 +58,9 @@ brw_isl_format_for_mesa_format(mesa_format mesa_format)
       [MESA_FORMAT_YCBCR_REV] = ISL_FORMAT_YCRCB_NORMAL,
       [MESA_FORMAT_YCBCR] = ISL_FORMAT_YCRCB_SWAPUVY,
       [MESA_FORMAT_R_UNORM8] = ISL_FORMAT_R8_UNORM,
-      [MESA_FORMAT_R8G8_UNORM] = ISL_FORMAT_R8G8_UNORM,
+      [MESA_FORMAT_RG_UNORM8] = ISL_FORMAT_R8G8_UNORM,
       [MESA_FORMAT_R_UNORM16] = ISL_FORMAT_R16_UNORM,
-      [MESA_FORMAT_R16G16_UNORM] = ISL_FORMAT_R16G16_UNORM,
+      [MESA_FORMAT_RG_UNORM16] = ISL_FORMAT_R16G16_UNORM,
       [MESA_FORMAT_B10G10R10A2_UNORM] = ISL_FORMAT_B10G10R10A2_UNORM,
       [MESA_FORMAT_S_UINT8] = ISL_FORMAT_R8_UINT,
 
@@ -125,10 +125,10 @@ brw_isl_format_for_mesa_format(mesa_format mesa_format)
       [MESA_FORMAT_RGBA_UINT32] = ISL_FORMAT_R32G32B32A32_UINT,
 
       [MESA_FORMAT_R_SNORM8] = ISL_FORMAT_R8_SNORM,
-      [MESA_FORMAT_R8G8_SNORM] = ISL_FORMAT_R8G8_SNORM,
+      [MESA_FORMAT_RG_SNORM8] = ISL_FORMAT_R8G8_SNORM,
       [MESA_FORMAT_R8G8B8A8_SNORM] = ISL_FORMAT_R8G8B8A8_SNORM,
       [MESA_FORMAT_R_SNORM16] = ISL_FORMAT_R16_SNORM,
-      [MESA_FORMAT_R16G16_SNORM] = ISL_FORMAT_R16G16_SNORM,
+      [MESA_FORMAT_RG_SNORM16] = ISL_FORMAT_R16G16_SNORM,
       [MESA_FORMAT_RGB_SNORM16] = ISL_FORMAT_R16G16B16_SNORM,
       [MESA_FORMAT_RGBA_SNORM16] = ISL_FORMAT_R16G16B16A16_SNORM,
       [MESA_FORMAT_RGBA_UNORM16] = ISL_FORMAT_R16G16B16A16_UNORM,
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 5716c7f254c..d6fb3e8d97c 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -219,9 +219,9 @@ intel_lower_compressed_format(struct brw_context *brw, mesa_format format)
    case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
       return MESA_FORMAT_R_SNORM16;
    case MESA_FORMAT_ETC2_RG11_EAC:
-      return MESA_FORMAT_R16G16_UNORM;
+      return MESA_FORMAT_RG_UNORM16;
    case MESA_FORMAT_ETC2_SIGNED_RG11_EAC:
-      return MESA_FORMAT_R16G16_SNORM;
+      return MESA_FORMAT_RG_SNORM16;
    default:
       /* Non ETC1 / ETC2 format */
       return format;