mesa: Fix Type A _INT formats to MESA_FORMAT naming standardNewStartAMF

Replace Type A _INT formats names with _SINT to match naming spec,
and update type C formats as follows:
    s/MESA_FORMAT_R_INT8\b/MESA_FORMAT_R_SINT8/g
    s/MESA_FORMAT_R_INT16\b/MESA_FORMAT_R_SINT16/g
    s/MESA_FORMAT_R_INT32\b/MESA_FORMAT_R_SINT32/g
    s/MESA_FORMAT_RG_INT8\b/MESA_FORMAT_RG_SINT8/g
    s/MESA_FORMAT_RG_INT16\b/MESA_FORMAT_RG_SINT16/g
    s/MESA_FORMAT_RG_INT32\b/MESA_FORMAT_RG_SINT32/g
    s/MESA_FORMAT_RGB_INT8\b/MESA_FORMAT_RGB_SINT8/g
    s/MESA_FORMAT_RGB_INT16\b/MESA_FORMAT_RGB_SINT16/g
    s/MESA_FORMAT_RGB_INT32\b/MESA_FORMAT_RGB_SINT32/g
    s/MESA_FORMAT_RGBA_INT8\b/MESA_FORMAT_RGBA_SINT8/g
    s/MESA_FORMAT_RGBA_INT16\b/MESA_FORMAT_RGBA_SINT16/g
    s/MESA_FORMAT_RGBA_INT32\b/MESA_FORMAT_RGBA_SINT32/g
    s/\bMESA_FORMAT_RED_RGTC1\b/MESA_FORMAT_R_RGTC1_UNORM/g
    s/\bMESA_FORMAT_SIGNED_RED_RGTC1\b/MESA_FORMAT_R_RGTC1_SNORM/g
    s/\bMESA_FORMAT_RG_RGTC2\b/MESA_FORMAT_RG_RGTC2_UNORM/g
    s/\bMESA_FORMAT_SIGNED_RG_RGTC2\b/MESA_FORMAT_RG_RGTC2_SNORM/g
    s/\bMESA_FORMAT_L_LATC1\b/MESA_FORMAT_L_LATC1_UNORM/g
    s/\bMESA_FORMAT_SIGNED_L_LATC1\b/MESA_FORMAT_L_LATC1_SNORM/g
    s/\bMESA_FORMAT_LA_LATC2\b/MESA_FORMAT_LA_LATC2_UNORM/g
    s/\bMESA_FORMAT_SIGNED_LA_LATC2\b/MESA_FORMAT_LA_LATC2_SNORM/g

14 files changed, 368 insertions, 368 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
index a004653d85..2f406315c0 100644
--- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
+++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
@@ -427,18 +427,18 @@ brw_format_for_mesa_format(mesa_format mesa_format)
       [MESA_FORMAT_LA_SINT16] = 0,
       [MESA_FORMAT_LA_SINT32] = 0,
 
-      [MESA_FORMAT_R_INT8] = BRW_SURFACEFORMAT_R8_SINT,
-      [MESA_FORMAT_RG_INT8] = BRW_SURFACEFORMAT_R8G8_SINT,
-      [MESA_FORMAT_RGB_INT8] = BRW_SURFACEFORMAT_R8G8B8_SINT,
-      [MESA_FORMAT_RGBA_INT8] = BRW_SURFACEFORMAT_R8G8B8A8_SINT,
-      [MESA_FORMAT_R_INT16] = BRW_SURFACEFORMAT_R16_SINT,
-      [MESA_FORMAT_RG_INT16] = BRW_SURFACEFORMAT_R16G16_SINT,
-      [MESA_FORMAT_RGB_INT16] = BRW_SURFACEFORMAT_R16G16B16_SINT,
-      [MESA_FORMAT_RGBA_INT16] = BRW_SURFACEFORMAT_R16G16B16A16_SINT,
-      [MESA_FORMAT_R_INT32] = BRW_SURFACEFORMAT_R32_SINT,
-      [MESA_FORMAT_RG_INT32] = BRW_SURFACEFORMAT_R32G32_SINT,
-      [MESA_FORMAT_RGB_INT32] = BRW_SURFACEFORMAT_R32G32B32_SINT,
-      [MESA_FORMAT_RGBA_INT32] = BRW_SURFACEFORMAT_R32G32B32A32_SINT,
+      [MESA_FORMAT_R_SINT8] = BRW_SURFACEFORMAT_R8_SINT,
+      [MESA_FORMAT_RG_SINT8] = BRW_SURFACEFORMAT_R8G8_SINT,
+      [MESA_FORMAT_RGB_SINT8] = BRW_SURFACEFORMAT_R8G8B8_SINT,
+      [MESA_FORMAT_RGBA_SINT8] = BRW_SURFACEFORMAT_R8G8B8A8_SINT,
+      [MESA_FORMAT_R_SINT16] = BRW_SURFACEFORMAT_R16_SINT,
+      [MESA_FORMAT_RG_SINT16] = BRW_SURFACEFORMAT_R16G16_SINT,
+      [MESA_FORMAT_RGB_SINT16] = BRW_SURFACEFORMAT_R16G16B16_SINT,
+      [MESA_FORMAT_RGBA_SINT16] = BRW_SURFACEFORMAT_R16G16B16A16_SINT,
+      [MESA_FORMAT_R_SINT32] = BRW_SURFACEFORMAT_R32_SINT,
+      [MESA_FORMAT_RG_SINT32] = BRW_SURFACEFORMAT_R32G32_SINT,
+      [MESA_FORMAT_RGB_SINT32] = BRW_SURFACEFORMAT_R32G32B32_SINT,
+      [MESA_FORMAT_RGBA_SINT32] = BRW_SURFACEFORMAT_R32G32B32A32_SINT,
 
       [MESA_FORMAT_R_UINT8] = BRW_SURFACEFORMAT_R8_UINT,
       [MESA_FORMAT_RG_UINT8] = BRW_SURFACEFORMAT_R8G8_UINT,
@@ -465,15 +465,15 @@ brw_format_for_mesa_format(mesa_format mesa_format)
       [MESA_FORMAT_RGBA_SNORM16] = BRW_SURFACEFORMAT_R16G16B16A16_SNORM,
       [MESA_FORMAT_RGBA_UNORM16] = BRW_SURFACEFORMAT_R16G16B16A16_UNORM,
 
-      [MESA_FORMAT_RED_RGTC1] = BRW_SURFACEFORMAT_BC4_UNORM,
-      [MESA_FORMAT_SIGNED_RED_RGTC1] = BRW_SURFACEFORMAT_BC4_SNORM,
-      [MESA_FORMAT_RG_RGTC2] = BRW_SURFACEFORMAT_BC5_UNORM,
-      [MESA_FORMAT_SIGNED_RG_RGTC2] = BRW_SURFACEFORMAT_BC5_SNORM,
+      [MESA_FORMAT_R_RGTC1_UNORM] = BRW_SURFACEFORMAT_BC4_UNORM,
+      [MESA_FORMAT_R_RGTC1_SNORM] = BRW_SURFACEFORMAT_BC4_SNORM,
+      [MESA_FORMAT_RG_RGTC2_UNORM] = BRW_SURFACEFORMAT_BC5_UNORM,
+      [MESA_FORMAT_RG_RGTC2_SNORM] = BRW_SURFACEFORMAT_BC5_SNORM,
 
-      [MESA_FORMAT_L_LATC1] = 0,
-      [MESA_FORMAT_SIGNED_L_LATC1] = 0,
-      [MESA_FORMAT_LA_LATC2] = 0,
-      [MESA_FORMAT_SIGNED_LA_LATC2] = 0,
+      [MESA_FORMAT_L_LATC1_UNORM] = 0,
+      [MESA_FORMAT_L_LATC1_SNORM] = 0,
+      [MESA_FORMAT_LA_LATC2_UNORM] = 0,
+      [MESA_FORMAT_LA_LATC2_SNORM] = 0,
 
       [MESA_FORMAT_ETC1_RGB8] = BRW_SURFACEFORMAT_ETC1_RGB8,
       [MESA_FORMAT_ETC2_RGB8] = BRW_SURFACEFORMAT_ETC2_RGB8,
diff --git a/src/mesa/main/format_pack.c b/src/mesa/main/format_pack.c
index 69014325ab..b6344fd5ea 100644
--- a/src/mesa/main/format_pack.c
+++ b/src/mesa/main/format_pack.c
@@ -1975,9 +1975,9 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format)
       table[MESA_FORMAT_RG_FLOAT16] = pack_ubyte_RG_FLOAT16;
 
       /* n/a */
-      table[MESA_FORMAT_RGBA_INT8] = NULL; /* pack_ubyte_RGBA_INT8 */
-      table[MESA_FORMAT_RGBA_INT16] = NULL; /* pack_ubyte_RGBA_INT16 */
-      table[MESA_FORMAT_RGBA_INT32] = NULL; /* pack_ubyte_RGBA_INT32 */
+      table[MESA_FORMAT_RGBA_SINT8] = NULL; /* pack_ubyte_RGBA_INT8 */
+      table[MESA_FORMAT_RGBA_SINT16] = NULL; /* pack_ubyte_RGBA_INT16 */
+      table[MESA_FORMAT_RGBA_SINT32] = NULL; /* pack_ubyte_RGBA_INT32 */
       table[MESA_FORMAT_RGBA_UINT8] = NULL; /* pack_ubyte_RGBA_UINT8 */
       table[MESA_FORMAT_RGBA_UINT16] = NULL; /* pack_ubyte_RGBA_UINT16 */
       table[MESA_FORMAT_RGBA_UINT32] = NULL; /* pack_ubyte_RGBA_UINT32 */
@@ -2139,9 +2139,9 @@ _mesa_get_pack_float_rgba_function(mesa_format format)
       table[MESA_FORMAT_RG_FLOAT16] = pack_float_RG_FLOAT16;
 
       /* n/a */
-      table[MESA_FORMAT_RGBA_INT8] = NULL;
-      table[MESA_FORMAT_RGBA_INT16] = NULL;
-      table[MESA_FORMAT_RGBA_INT32] = NULL;
+      table[MESA_FORMAT_RGBA_SINT8] = NULL;
+      table[MESA_FORMAT_RGBA_SINT16] = NULL;
+      table[MESA_FORMAT_RGBA_SINT32] = NULL;
       table[MESA_FORMAT_RGBA_UINT8] = NULL;
       table[MESA_FORMAT_RGBA_UINT16] = NULL;
       table[MESA_FORMAT_RGBA_UINT32] = NULL;
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index a81628312a..a2e3445cee 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -2428,18 +2428,18 @@ get_unpack_rgba_function(mesa_format format)
       table[MESA_FORMAT_LA_SINT16] = unpack_LUMINANCE_ALPHA_INT16;
       table[MESA_FORMAT_LA_SINT32] = unpack_LUMINANCE_ALPHA_INT32;
 
-      table[MESA_FORMAT_R_INT8] = unpack_R_INT8;
-      table[MESA_FORMAT_RG_INT8] = unpack_RG_INT8;
-      table[MESA_FORMAT_RGB_INT8] = unpack_RGB_INT8;
-      table[MESA_FORMAT_RGBA_INT8] = unpack_RGBA_INT8;
-      table[MESA_FORMAT_R_INT16] = unpack_R_INT16;
-      table[MESA_FORMAT_RG_INT16] = unpack_RG_INT16;
-      table[MESA_FORMAT_RGB_INT16] = unpack_RGB_INT16;
-      table[MESA_FORMAT_RGBA_INT16] = unpack_RGBA_INT16;
-      table[MESA_FORMAT_R_INT32] = unpack_R_INT32;
-      table[MESA_FORMAT_RG_INT32] = unpack_RG_INT32;
-      table[MESA_FORMAT_RGB_INT32] = unpack_RGB_INT32;
-      table[MESA_FORMAT_RGBA_INT32] = unpack_RGBA_INT32;
+      table[MESA_FORMAT_R_SINT8] = unpack_R_INT8;
+      table[MESA_FORMAT_RG_SINT8] = unpack_RG_INT8;
+      table[MESA_FORMAT_RGB_SINT8] = unpack_RGB_INT8;
+      table[MESA_FORMAT_RGBA_SINT8] = unpack_RGBA_INT8;
+      table[MESA_FORMAT_R_SINT16] = unpack_R_INT16;
+      table[MESA_FORMAT_RG_SINT16] = unpack_RG_INT16;
+      table[MESA_FORMAT_RGB_SINT16] = unpack_RGB_INT16;
+      table[MESA_FORMAT_RGBA_SINT16] = unpack_RGBA_INT16;
+      table[MESA_FORMAT_R_SINT32] = unpack_R_INT32;
+      table[MESA_FORMAT_RG_SINT32] = unpack_RG_INT32;
+      table[MESA_FORMAT_RGB_SINT32] = unpack_RGB_INT32;
+      table[MESA_FORMAT_RGBA_SINT32] = unpack_RGBA_INT32;
       table[MESA_FORMAT_R_UINT8] = unpack_R_UINT8;
       table[MESA_FORMAT_RG_UINT8] = unpack_RG_UINT8;
       table[MESA_FORMAT_RGB_UINT8] = unpack_RGB_UINT8;
@@ -2465,15 +2465,15 @@ get_unpack_rgba_function(mesa_format format)
       table[MESA_FORMAT_RGBA_SNORM16] = unpack_SIGNED_RGBA_16;
       table[MESA_FORMAT_RGBA_UNORM16] = unpack_RGBA_16;
 
-      table[MESA_FORMAT_RED_RGTC1] = unpack_RED_RGTC1;
-      table[MESA_FORMAT_SIGNED_RED_RGTC1] = unpack_SIGNED_RED_RGTC1;
-      table[MESA_FORMAT_RG_RGTC2] = unpack_RG_RGTC2;
-      table[MESA_FORMAT_SIGNED_RG_RGTC2] = unpack_SIGNED_RG_RGTC2;
+      table[MESA_FORMAT_R_RGTC1_UNORM] = unpack_RED_RGTC1;
+      table[MESA_FORMAT_R_RGTC1_SNORM] = unpack_SIGNED_RED_RGTC1;
+      table[MESA_FORMAT_RG_RGTC2_UNORM] = unpack_RG_RGTC2;
+      table[MESA_FORMAT_RG_RGTC2_SNORM] = unpack_SIGNED_RG_RGTC2;
 
-      table[MESA_FORMAT_L_LATC1] = unpack_L_LATC1;
-      table[MESA_FORMAT_SIGNED_L_LATC1] = unpack_SIGNED_L_LATC1;
-      table[MESA_FORMAT_LA_LATC2] = unpack_LA_LATC2;
-      table[MESA_FORMAT_SIGNED_LA_LATC2] = unpack_SIGNED_LA_LATC2;
+      table[MESA_FORMAT_L_LATC1_UNORM] = unpack_L_LATC1;
+      table[MESA_FORMAT_L_LATC1_SNORM] = unpack_SIGNED_L_LATC1;
+      table[MESA_FORMAT_LA_LATC2_UNORM] = unpack_LA_LATC2;
+      table[MESA_FORMAT_LA_LATC2_SNORM] = unpack_SIGNED_LA_LATC2;
 
       table[MESA_FORMAT_ETC1_RGB8] = unpack_ETC1_RGB8;
       table[MESA_FORMAT_ETC2_RGB8] = unpack_ETC2_RGB8;
@@ -3648,21 +3648,21 @@ _mesa_unpack_uint_rgba_row(mesa_format format, GLuint n,
        * make separate paths for 32-bit-to-32-bit integer unpack.
        */
    case MESA_FORMAT_RGBA_UINT32:
-   case MESA_FORMAT_RGBA_INT32:
+   case MESA_FORMAT_RGBA_SINT32:
       unpack_int_rgba_RGBA_UINT32(src, dst, n);
       break;
 
    case MESA_FORMAT_RGBA_UINT16:
       unpack_int_rgba_RGBA_UINT16(src, dst, n);
       break;
-   case MESA_FORMAT_RGBA_INT16:
+   case MESA_FORMAT_RGBA_SINT16:
       unpack_int_rgba_RGBA_INT16(src, dst, n);
       break;
 
    case MESA_FORMAT_RGBA_UINT8:
       unpack_int_rgba_RGBA_UINT8(src, dst, n);
       break;
-   case MESA_FORMAT_RGBA_INT8:
+   case MESA_FORMAT_RGBA_SINT8:
       unpack_int_rgba_RGBA_INT8(src, dst, n);
       break;
 
@@ -3675,59 +3675,59 @@ _mesa_unpack_uint_rgba_row(mesa_format format, GLuint n,
       break;
 
    case MESA_FORMAT_RGB_UINT32:
-   case MESA_FORMAT_RGB_INT32:
+   case MESA_FORMAT_RGB_SINT32:
       unpack_int_rgba_RGB_UINT32(src, dst, n);
       break;
 
    case MESA_FORMAT_RGB_UINT16:
       unpack_int_rgba_RGB_UINT16(src, dst, n);
       break;
-   case MESA_FORMAT_RGB_INT16:
+   case MESA_FORMAT_RGB_SINT16:
       unpack_int_rgba_RGB_INT16(src, dst, n);
       break;
 
    case MESA_FORMAT_RGB_UINT8:
       unpack_int_rgba_RGB_UINT8(src, dst, n);
       break;
-   case MESA_FORMAT_RGB_INT8:
+   case MESA_FORMAT_RGB_SINT8:
       unpack_int_rgba_RGB_INT8(src, dst, n);
       break;
 
    case MESA_FORMAT_RG_UINT32:
-   case MESA_FORMAT_RG_INT32:
+   case MESA_FORMAT_RG_SINT32:
       unpack_int_rgba_RG_UINT32(src, dst, n);
       break;
 
    case MESA_FORMAT_RG_UINT16:
       unpack_int_rgba_RG_UINT16(src, dst, n);
       break;
-   case MESA_FORMAT_RG_INT16:
+   case MESA_FORMAT_RG_SINT16:
       unpack_int_rgba_RG_INT16(src, dst, n);
       break;
 
    case MESA_FORMAT_RG_UINT8:
       unpack_int_rgba_RG_UINT8(src, dst, n);
       break;
-   case MESA_FORMAT_RG_INT8:
+   case MESA_FORMAT_RG_SINT8:
       unpack_int_rgba_RG_INT8(src, dst, n);
       break;
 
    case MESA_FORMAT_R_UINT32:
-   case MESA_FORMAT_R_INT32:
+   case MESA_FORMAT_R_SINT32:
       unpack_int_rgba_R_UINT32(src, dst, n);
       break;
 
    case MESA_FORMAT_R_UINT16:
       unpack_int_rgba_R_UINT16(src, dst, n);
       break;
-   case MESA_FORMAT_R_INT16:
+   case MESA_FORMAT_R_SINT16:
       unpack_int_rgba_R_INT16(src, dst, n);
       break;
 
    case MESA_FORMAT_R_UINT8:
       unpack_int_rgba_R_UINT8(src, dst, n);
       break;
-   case MESA_FORMAT_R_INT8:
+   case MESA_FORMAT_R_SINT8:
       unpack_int_rgba_R_INT8(src, dst, n);
       break;
 
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index ca0f0a96df..10731d5a4b 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -994,8 +994,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
    },
 
    {
-      MESA_FORMAT_R_INT8,
-      "MESA_FORMAT_R_INT8",
+      MESA_FORMAT_R_SINT8,
+      "MESA_FORMAT_R_SINT8",
       GL_RED,
       GL_INT,
       8, 0, 0, 0,
@@ -1003,8 +1003,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 1
    },
    {
-      MESA_FORMAT_RG_INT8,
-      "MESA_FORMAT_RG_INT8",
+      MESA_FORMAT_RG_SINT8,
+      "MESA_FORMAT_RG_SINT8",
       GL_RG,
       GL_INT,
       8, 8, 0, 0,
@@ -1012,8 +1012,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_RGB_INT8,
-      "MESA_FORMAT_RGB_INT8",
+      MESA_FORMAT_RGB_SINT8,
+      "MESA_FORMAT_RGB_SINT8",
       GL_RGB,
       GL_INT,
       8, 8, 8, 0,
@@ -1021,8 +1021,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 3
    },
    {
-      MESA_FORMAT_RGBA_INT8,
-      "MESA_FORMAT_RGBA_INT8",
+      MESA_FORMAT_RGBA_SINT8,
+      "MESA_FORMAT_RGBA_SINT8",
       GL_RGBA,
       GL_INT,
       8, 8, 8, 8,
@@ -1030,8 +1030,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_R_INT16,
-      "MESA_FORMAT_R_INT16",
+      MESA_FORMAT_R_SINT16,
+      "MESA_FORMAT_R_SINT16",
       GL_RED,
       GL_INT,
       16, 0, 0, 0,
@@ -1039,8 +1039,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_RG_INT16,
-      "MESA_FORMAT_RG_INT16",
+      MESA_FORMAT_RG_SINT16,
+      "MESA_FORMAT_RG_SINT16",
       GL_RG,
       GL_INT,
       16, 16, 0, 0,
@@ -1048,8 +1048,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_RGB_INT16,
-      "MESA_FORMAT_RGB_INT16",
+      MESA_FORMAT_RGB_SINT16,
+      "MESA_FORMAT_RGB_SINT16",
       GL_RGB,
       GL_INT,
       16, 16, 16, 0,
@@ -1057,8 +1057,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 6
    },
    {
-      MESA_FORMAT_RGBA_INT16,
-      "MESA_FORMAT_RGBA_INT16",
+      MESA_FORMAT_RGBA_SINT16,
+      "MESA_FORMAT_RGBA_SINT16",
       GL_RGBA,
       GL_INT,
       16, 16, 16, 16,
@@ -1066,8 +1066,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-      MESA_FORMAT_R_INT32,
-      "MESA_FORMAT_R_INT32",
+      MESA_FORMAT_R_SINT32,
+      "MESA_FORMAT_R_SINT32",
       GL_RED,
       GL_INT,
       32, 0, 0, 0,
@@ -1075,8 +1075,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_RG_INT32,
-      "MESA_FORMAT_RG_INT32",
+      MESA_FORMAT_RG_SINT32,
+      "MESA_FORMAT_RG_SINT32",
       GL_RG,
       GL_INT,
       32, 32, 0, 0,
@@ -1084,8 +1084,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-      MESA_FORMAT_RGB_INT32,
-      "MESA_FORMAT_RGB_INT32",
+      MESA_FORMAT_RGB_SINT32,
+      "MESA_FORMAT_RGB_SINT32",
       GL_RGB,
       GL_INT,
       32, 32, 32, 0,
@@ -1093,8 +1093,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 12
    },
    {
-      MESA_FORMAT_RGBA_INT32,
-      "MESA_FORMAT_RGBA_INT32",
+      MESA_FORMAT_RGBA_SINT32,
+      "MESA_FORMAT_RGBA_SINT32",
       GL_RGBA,
       GL_INT,
       32, 32, 32, 32,
@@ -1315,8 +1315,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-     MESA_FORMAT_RED_RGTC1,
-     "MESA_FORMAT_RED_RGTC1",
+     MESA_FORMAT_R_RGTC1_UNORM,
+     "MESA_FORMAT_R_RGTC1_UNORM",
      GL_RED,
      GL_UNSIGNED_NORMALIZED,
      8, 0, 0, 0,
@@ -1324,8 +1324,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
      4, 4, 8                     /* 8 bytes per 4x4 block */
    },
    {
-     MESA_FORMAT_SIGNED_RED_RGTC1,
-     "MESA_FORMAT_SIGNED_RED_RGTC1",
+     MESA_FORMAT_R_RGTC1_SNORM,
+     "MESA_FORMAT_R_RGTC1_SNORM",
      GL_RED,
      GL_SIGNED_NORMALIZED,
      8, 0, 0, 0,
@@ -1333,8 +1333,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
      4, 4, 8                     /* 8 bytes per 4x4 block */
    },
    {
-     MESA_FORMAT_RG_RGTC2,
-     "MESA_FORMAT_RG_RGTC2",
+     MESA_FORMAT_RG_RGTC2_UNORM,
+     "MESA_FORMAT_RG_RGTC2_UNORM",
      GL_RG,
      GL_UNSIGNED_NORMALIZED,
      8, 8, 0, 0,
@@ -1342,8 +1342,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
      4, 4, 16                     /* 16 bytes per 4x4 block */
    },
    {
-     MESA_FORMAT_SIGNED_RG_RGTC2,
-     "MESA_FORMAT_SIGNED_RG_RGTC2",
+     MESA_FORMAT_RG_RGTC2_SNORM,
+     "MESA_FORMAT_RG_RGTC2_SNORM",
      GL_RG,
      GL_SIGNED_NORMALIZED,
      8, 8, 0, 0,
@@ -1351,8 +1351,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
      4, 4, 16                     /* 16 bytes per 4x4 block */
    },
    {
-     MESA_FORMAT_L_LATC1,
-     "MESA_FORMAT_L_LATC1",
+     MESA_FORMAT_L_LATC1_UNORM,
+     "MESA_FORMAT_L_LATC1_UNORM",
      GL_LUMINANCE,
      GL_UNSIGNED_NORMALIZED,
      0, 0, 0, 0,
@@ -1360,8 +1360,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
      4, 4, 8                     /* 8 bytes per 4x4 block */
    },
    {
-     MESA_FORMAT_SIGNED_L_LATC1,
-     "MESA_FORMAT_SIGNED_L_LATC1",
+     MESA_FORMAT_L_LATC1_SNORM,
+     "MESA_FORMAT_L_LATC1_SNORM",
      GL_LUMINANCE,
      GL_SIGNED_NORMALIZED,
      0, 0, 0, 0,
@@ -1369,8 +1369,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
      4, 4, 8                     /* 8 bytes per 4x4 block */
    },
    {
-     MESA_FORMAT_LA_LATC2,
-     "MESA_FORMAT_LA_LATC2",
+     MESA_FORMAT_LA_LATC2_UNORM,
+     "MESA_FORMAT_LA_LATC2_UNORM",
      GL_LUMINANCE_ALPHA,
      GL_UNSIGNED_NORMALIZED,
      0, 0, 0, 4,
@@ -1378,8 +1378,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
      4, 4, 16                     /* 16 bytes per 4x4 block */
    },
    {
-     MESA_FORMAT_SIGNED_LA_LATC2,
-     "MESA_FORMAT_SIGNED_LA_LATC2",
+     MESA_FORMAT_LA_LATC2_SNORM,
+     "MESA_FORMAT_LA_LATC2_SNORM",
      GL_LUMINANCE_ALPHA,
      GL_SIGNED_NORMALIZED,
      0, 0, 0, 4,
@@ -2120,21 +2120,21 @@ _mesa_get_uncompressed_format(mesa_format format)
    case MESA_FORMAT_RGBA_DXT5:
    case MESA_FORMAT_SRGBA_DXT5:
       return MESA_FORMAT_A8B8G8R8_UNORM;
-   case MESA_FORMAT_RED_RGTC1:
+   case MESA_FORMAT_R_RGTC1_UNORM:
       return MESA_FORMAT_R_UNORM8;
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
+   case MESA_FORMAT_R_RGTC1_SNORM:
       return MESA_FORMAT_R_SNORM8;
-   case MESA_FORMAT_RG_RGTC2:
+   case MESA_FORMAT_RG_RGTC2_UNORM:
       return MESA_FORMAT_R8G8_UNORM;
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
+   case MESA_FORMAT_RG_RGTC2_SNORM:
       return MESA_FORMAT_R8G8_SNORM;
-   case MESA_FORMAT_L_LATC1:
+   case MESA_FORMAT_L_LATC1_UNORM:
       return MESA_FORMAT_L_UNORM8;
-   case MESA_FORMAT_SIGNED_L_LATC1:
+   case MESA_FORMAT_L_LATC1_SNORM:
       return MESA_FORMAT_L_SNORM8;
-   case MESA_FORMAT_LA_LATC2:
+   case MESA_FORMAT_LA_LATC2_UNORM:
       return MESA_FORMAT_L8A8_UNORM;
-   case MESA_FORMAT_SIGNED_LA_LATC2:
+   case MESA_FORMAT_LA_LATC2_SNORM:
       return MESA_FORMAT_L8A8_SNORM;
    case MESA_FORMAT_ETC1_RGB8:
    case MESA_FORMAT_ETC2_RGB8:
@@ -2585,14 +2585,14 @@ _mesa_format_to_type_and_comps(mesa_format format,
    case MESA_FORMAT_SRGBA_DXT1:
    case MESA_FORMAT_SRGBA_DXT3:
    case MESA_FORMAT_SRGBA_DXT5:
-   case MESA_FORMAT_RED_RGTC1:
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
-   case MESA_FORMAT_RG_RGTC2:
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
-   case MESA_FORMAT_L_LATC1:
-   case MESA_FORMAT_SIGNED_L_LATC1:
-   case MESA_FORMAT_LA_LATC2:
-   case MESA_FORMAT_SIGNED_LA_LATC2:
+   case MESA_FORMAT_R_RGTC1_UNORM:
+   case MESA_FORMAT_R_RGTC1_SNORM:
+   case MESA_FORMAT_RG_RGTC2_UNORM:
+   case MESA_FORMAT_RG_RGTC2_SNORM:
+   case MESA_FORMAT_L_LATC1_UNORM:
+   case MESA_FORMAT_L_LATC1_SNORM:
+   case MESA_FORMAT_LA_LATC2_UNORM:
+   case MESA_FORMAT_LA_LATC2_SNORM:
    case MESA_FORMAT_ETC1_RGB8:
    case MESA_FORMAT_ETC2_RGB8:
    case MESA_FORMAT_ETC2_SRGB8:
@@ -2714,51 +2714,51 @@ _mesa_format_to_type_and_comps(mesa_format format,
       *comps = 2;
       return;
 
-   case MESA_FORMAT_R_INT8:
+   case MESA_FORMAT_R_SINT8:
       *datatype = GL_BYTE;
       *comps = 1;
       return;
-   case MESA_FORMAT_RG_INT8:
+   case MESA_FORMAT_RG_SINT8:
       *datatype = GL_BYTE;
       *comps = 2;
       return;
-   case MESA_FORMAT_RGB_INT8:
+   case MESA_FORMAT_RGB_SINT8:
       *datatype = GL_BYTE;
       *comps = 3;
       return;
-   case MESA_FORMAT_RGBA_INT8:
+   case MESA_FORMAT_RGBA_SINT8:
       *datatype = GL_BYTE;
       *comps = 4;
       return;
-   case MESA_FORMAT_R_INT16:
+   case MESA_FORMAT_R_SINT16:
       *datatype = GL_SHORT;
       *comps = 1;
       return;
-   case MESA_FORMAT_RG_INT16:
+   case MESA_FORMAT_RG_SINT16:
       *datatype = GL_SHORT;
       *comps = 2;
       return;
-   case MESA_FORMAT_RGB_INT16:
+   case MESA_FORMAT_RGB_SINT16:
       *datatype = GL_SHORT;
       *comps = 3;
       return;
-   case MESA_FORMAT_RGBA_INT16:
+   case MESA_FORMAT_RGBA_SINT16:
       *datatype = GL_SHORT;
       *comps = 4;
       return;
-   case MESA_FORMAT_R_INT32:
+   case MESA_FORMAT_R_SINT32:
       *datatype = GL_INT;
       *comps = 1;
       return;
-   case MESA_FORMAT_RG_INT32:
+   case MESA_FORMAT_RG_SINT32:
       *datatype = GL_INT;
       *comps = 2;
       return;
-   case MESA_FORMAT_RGB_INT32:
+   case MESA_FORMAT_RGB_SINT32:
       *datatype = GL_INT;
       *comps = 3;
       return;
-   case MESA_FORMAT_RGBA_INT32:
+   case MESA_FORMAT_RGBA_SINT32:
       *datatype = GL_INT;
       *comps = 4;
       return;
@@ -3253,29 +3253,29 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
       return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_INT &&
              !swapBytes;
 
-   case MESA_FORMAT_R_INT8:
+   case MESA_FORMAT_R_SINT8:
       return format == GL_RED_INTEGER && type == GL_BYTE;
-   case MESA_FORMAT_RG_INT8:
+   case MESA_FORMAT_RG_SINT8:
       return format == GL_RG_INTEGER && type == GL_BYTE && !swapBytes;
-   case MESA_FORMAT_RGB_INT8:
+   case MESA_FORMAT_RGB_SINT8:
       return format == GL_RGB_INTEGER && type == GL_BYTE && !swapBytes;
-   case MESA_FORMAT_RGBA_INT8:
+   case MESA_FORMAT_RGBA_SINT8:
       return format == GL_RGBA_INTEGER && type == GL_BYTE && !swapBytes;
-   case MESA_FORMAT_R_INT16:
+   case MESA_FORMAT_R_SINT16:
       return format == GL_RED_INTEGER && type == GL_SHORT && !swapBytes;
-   case MESA_FORMAT_RG_INT16:
+   case MESA_FORMAT_RG_SINT16:
       return format == GL_RG_INTEGER && type == GL_SHORT && !swapBytes;
-   case MESA_FORMAT_RGB_INT16:
+   case MESA_FORMAT_RGB_SINT16:
       return format == GL_RGB_INTEGER && type == GL_SHORT && !swapBytes;
-   case MESA_FORMAT_RGBA_INT16:
+   case MESA_FORMAT_RGBA_SINT16:
       return format == GL_RGBA_INTEGER && type == GL_SHORT && !swapBytes;
-   case MESA_FORMAT_R_INT32:
+   case MESA_FORMAT_R_SINT32:
       return format == GL_RED_INTEGER && type == GL_INT && !swapBytes;
-   case MESA_FORMAT_RG_INT32:
+   case MESA_FORMAT_RG_SINT32:
       return format == GL_RG_INTEGER && type == GL_INT && !swapBytes;
-   case MESA_FORMAT_RGB_INT32:
+   case MESA_FORMAT_RGB_SINT32:
       return format == GL_RGB_INTEGER && type == GL_INT && !swapBytes;
-   case MESA_FORMAT_RGBA_INT32:
+   case MESA_FORMAT_RGBA_SINT32:
       return format == GL_RGBA_INTEGER && type == GL_INT && !swapBytes;
 
    case MESA_FORMAT_R_UINT8:
@@ -3350,16 +3350,16 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
       return format == GL_RGBA && type == GL_UNSIGNED_SHORT &&
              !swapBytes;
 
-   case MESA_FORMAT_RED_RGTC1:
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
-   case MESA_FORMAT_RG_RGTC2:
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
+   case MESA_FORMAT_R_RGTC1_UNORM:
+   case MESA_FORMAT_R_RGTC1_SNORM:
+   case MESA_FORMAT_RG_RGTC2_UNORM:
+   case MESA_FORMAT_RG_RGTC2_SNORM:
       return GL_FALSE;
 
-   case MESA_FORMAT_L_LATC1:
-   case MESA_FORMAT_SIGNED_L_LATC1:
-   case MESA_FORMAT_LA_LATC2:
-   case MESA_FORMAT_SIGNED_LA_LATC2:
+   case MESA_FORMAT_L_LATC1_UNORM:
+   case MESA_FORMAT_L_LATC1_SNORM:
+   case MESA_FORMAT_LA_LATC2_UNORM:
+   case MESA_FORMAT_LA_LATC2_SNORM:
       return GL_FALSE;
 
    case MESA_FORMAT_ETC1_RGB8:
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index d2eedc1cf4..66c01c1c9a 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -498,19 +498,19 @@ typedef enum
    MESA_FORMAT_LA_SINT16,
    MESA_FORMAT_LA_SINT32,
 
-   MESA_FORMAT_R_INT8,
-   MESA_FORMAT_RG_INT8,
-   MESA_FORMAT_RGB_INT8,
-   MESA_FORMAT_RGBA_INT8,
-   MESA_FORMAT_R_INT16,
-   MESA_FORMAT_RG_INT16,
-   MESA_FORMAT_RGB_INT16,
-   MESA_FORMAT_RGBA_INT16,
-
-   MESA_FORMAT_R_INT32,
-   MESA_FORMAT_RG_INT32,
-   MESA_FORMAT_RGB_INT32,
-   MESA_FORMAT_RGBA_INT32,
+   MESA_FORMAT_R_SINT8,
+   MESA_FORMAT_RG_SINT8,
+   MESA_FORMAT_RGB_SINT8,
+   MESA_FORMAT_RGBA_SINT8,
+   MESA_FORMAT_R_SINT16,
+   MESA_FORMAT_RG_SINT16,
+   MESA_FORMAT_RGB_SINT16,
+   MESA_FORMAT_RGBA_SINT16,
+
+   MESA_FORMAT_R_SINT32,
+   MESA_FORMAT_RG_SINT32,
+   MESA_FORMAT_RGB_SINT32,
+   MESA_FORMAT_RGBA_SINT32,
 
    /**
     * \name Non-normalized unsigned integer formats.
@@ -562,17 +562,17 @@ typedef enum
 
    /*@{*/
    /* Type C formats */
-   MESA_FORMAT_RED_RGTC1,
-   MESA_FORMAT_SIGNED_RED_RGTC1,
-   MESA_FORMAT_RG_RGTC2,
-   MESA_FORMAT_SIGNED_RG_RGTC2,
+   MESA_FORMAT_R_RGTC1_UNORM,
+   MESA_FORMAT_R_RGTC1_SNORM,
+   MESA_FORMAT_RG_RGTC2_UNORM,
+   MESA_FORMAT_RG_RGTC2_SNORM,
    /*@}*/
 
    /*@{*/
-   MESA_FORMAT_L_LATC1,
-   MESA_FORMAT_SIGNED_L_LATC1,
-   MESA_FORMAT_LA_LATC2,
-   MESA_FORMAT_SIGNED_LA_LATC2,
+   MESA_FORMAT_L_LATC1_UNORM,
+   MESA_FORMAT_L_LATC1_SNORM,
+   MESA_FORMAT_LA_LATC2_UNORM,
+   MESA_FORMAT_LA_LATC2_SNORM,
    /*@}*/
 
    MESA_FORMAT_ETC1_RGB8,
diff --git a/src/mesa/main/shaderimage.c b/src/mesa/main/shaderimage.c
index a7776b7745..d1e752d3df 100644
--- a/src/mesa/main/shaderimage.c
+++ b/src/mesa/main/shaderimage.c
@@ -113,31 +113,31 @@ get_image_format(GLenum format)
       return MESA_FORMAT_R_UINT8;
 
    case GL_RGBA32I:
-      return MESA_FORMAT_RGBA_INT32;
+      return MESA_FORMAT_RGBA_SINT32;
 
    case GL_RGBA16I:
-      return MESA_FORMAT_RGBA_INT16;
+      return MESA_FORMAT_RGBA_SINT16;
 
    case GL_RGBA8I:
-      return MESA_FORMAT_RGBA_INT8;
+      return MESA_FORMAT_RGBA_SINT8;
 
    case GL_RG32I:
-      return MESA_FORMAT_RG_INT32;
+      return MESA_FORMAT_RG_SINT32;
 
    case GL_RG16I:
-      return MESA_FORMAT_RG_INT16;
+      return MESA_FORMAT_RG_SINT16;
 
    case GL_RG8I:
-      return MESA_FORMAT_RG_INT8;
+      return MESA_FORMAT_RG_SINT8;
 
    case GL_R32I:
-      return MESA_FORMAT_R_INT32;
+      return MESA_FORMAT_R_SINT32;
 
    case GL_R16I:
-      return MESA_FORMAT_R_INT16;
+      return MESA_FORMAT_R_SINT16;
 
    case GL_R8I:
-      return MESA_FORMAT_R_INT8;
+      return MESA_FORMAT_R_SINT8;
 
    case GL_RGBA16:
       return MESA_FORMAT_RGBA_UNORM16;
@@ -259,31 +259,31 @@ get_image_format_class(mesa_format format)
    case MESA_FORMAT_R_UINT8:
       return IMAGE_FORMAT_CLASS_1X8;
 
-   case MESA_FORMAT_RGBA_INT32:
+   case MESA_FORMAT_RGBA_SINT32:
       return IMAGE_FORMAT_CLASS_4X32;
 
-   case MESA_FORMAT_RGBA_INT16:
+   case MESA_FORMAT_RGBA_SINT16:
       return IMAGE_FORMAT_CLASS_4X16;
 
-   case MESA_FORMAT_RGBA_INT8:
+   case MESA_FORMAT_RGBA_SINT8:
       return IMAGE_FORMAT_CLASS_4X8;
 
-   case MESA_FORMAT_RG_INT32:
+   case MESA_FORMAT_RG_SINT32:
       return IMAGE_FORMAT_CLASS_2X32;
 
-   case MESA_FORMAT_RG_INT16:
+   case MESA_FORMAT_RG_SINT16:
       return IMAGE_FORMAT_CLASS_2X16;
 
-   case MESA_FORMAT_RG_INT8:
+   case MESA_FORMAT_RG_SINT8:
       return IMAGE_FORMAT_CLASS_2X8;
 
-   case MESA_FORMAT_R_INT32:
+   case MESA_FORMAT_R_SINT32:
       return IMAGE_FORMAT_CLASS_1X32;
 
-   case MESA_FORMAT_R_INT16:
+   case MESA_FORMAT_R_SINT16:
       return IMAGE_FORMAT_CLASS_1X16;
 
-   case MESA_FORMAT_R_INT8:
+   case MESA_FORMAT_R_SINT8:
       return IMAGE_FORMAT_CLASS_1X8;
 
    case MESA_FORMAT_RGBA_UNORM16:
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 4763363264..9dbfe9ffef 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -393,23 +393,23 @@ _mesa_glenum_to_compressed_format(GLenum format)
       return MESA_FORMAT_SRGBA_DXT5;
 
    case GL_COMPRESSED_RED_RGTC1:
-      return MESA_FORMAT_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_UNORM;
    case GL_COMPRESSED_SIGNED_RED_RGTC1:
-      return MESA_FORMAT_SIGNED_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_SNORM;
    case GL_COMPRESSED_RG_RGTC2:
-      return MESA_FORMAT_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_UNORM;
    case GL_COMPRESSED_SIGNED_RG_RGTC2:
-      return MESA_FORMAT_SIGNED_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_SNORM;
 
    case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_L_LATC1;
+      return MESA_FORMAT_L_LATC1_UNORM;
    case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_SIGNED_L_LATC1;
+      return MESA_FORMAT_L_LATC1_SNORM;
    case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
    case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-      return MESA_FORMAT_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_UNORM;
    case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-      return MESA_FORMAT_SIGNED_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_SNORM;
 
    case GL_ETC1_RGB8_OES:
       return MESA_FORMAT_ETC1_RGB8;
@@ -474,22 +474,22 @@ _mesa_compressed_format_to_glenum(struct gl_context *ctx, mesa_format mesaFormat
       return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
    case MESA_FORMAT_SRGBA_DXT5:
       return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
-   case MESA_FORMAT_RED_RGTC1:
+   case MESA_FORMAT_R_RGTC1_UNORM:
       return GL_COMPRESSED_RED_RGTC1;
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
+   case MESA_FORMAT_R_RGTC1_SNORM:
       return GL_COMPRESSED_SIGNED_RED_RGTC1;
-   case MESA_FORMAT_RG_RGTC2:
+   case MESA_FORMAT_RG_RGTC2_UNORM:
       return GL_COMPRESSED_RG_RGTC2;
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
+   case MESA_FORMAT_RG_RGTC2_SNORM:
       return GL_COMPRESSED_SIGNED_RG_RGTC2;
 
-   case MESA_FORMAT_L_LATC1:
+   case MESA_FORMAT_L_LATC1_UNORM:
       return GL_COMPRESSED_LUMINANCE_LATC1_EXT;
-   case MESA_FORMAT_SIGNED_L_LATC1:
+   case MESA_FORMAT_L_LATC1_SNORM:
       return GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT;
-   case MESA_FORMAT_LA_LATC2:
+   case MESA_FORMAT_LA_LATC2_UNORM:
       return GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT;
-   case MESA_FORMAT_SIGNED_LA_LATC2:
+   case MESA_FORMAT_LA_LATC2_SNORM:
       return GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT;
 
    case MESA_FORMAT_ETC1_RGB8:
@@ -575,14 +575,14 @@ _mesa_get_compressed_fetch_func(mesa_format format)
    case MESA_FORMAT_RGB_FXT1:
    case MESA_FORMAT_RGBA_FXT1:
       return _mesa_get_fxt_fetch_func(format);
-   case MESA_FORMAT_RED_RGTC1:
-   case MESA_FORMAT_L_LATC1:
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
-   case MESA_FORMAT_SIGNED_L_LATC1:
-   case MESA_FORMAT_RG_RGTC2:
-   case MESA_FORMAT_LA_LATC2:
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
-   case MESA_FORMAT_SIGNED_LA_LATC2:
+   case MESA_FORMAT_R_RGTC1_UNORM:
+   case MESA_FORMAT_L_LATC1_UNORM:
+   case MESA_FORMAT_R_RGTC1_SNORM:
+   case MESA_FORMAT_L_LATC1_SNORM:
+   case MESA_FORMAT_RG_RGTC2_UNORM:
+   case MESA_FORMAT_LA_LATC2_UNORM:
+   case MESA_FORMAT_RG_RGTC2_SNORM:
+   case MESA_FORMAT_LA_LATC2_SNORM:
       return _mesa_get_compressed_rgtc_func(format);
    case MESA_FORMAT_ETC1_RGB8:
       return _mesa_get_etc_fetch_func(format);
diff --git a/src/mesa/main/texcompress_rgtc.c b/src/mesa/main/texcompress_rgtc.c
index 7f052fbaf9..1012699f55 100644
--- a/src/mesa/main/texcompress_rgtc.c
+++ b/src/mesa/main/texcompress_rgtc.c
@@ -97,8 +97,8 @@ _mesa_texstore_red_rgtc1(TEXSTORE_PARAMS)
    GLubyte srcpixels[4][4];
    GLubyte *blkaddr;
    GLint dstRowDiff;
-   ASSERT(dstFormat == MESA_FORMAT_RED_RGTC1 ||
-          dstFormat == MESA_FORMAT_L_LATC1);
+   ASSERT(dstFormat == MESA_FORMAT_R_RGTC1_UNORM ||
+          dstFormat == MESA_FORMAT_L_LATC1_UNORM);
 
    tempImage = _mesa_make_temp_ubyte_image(ctx, dims,
 					  baseInternalFormat,
@@ -144,8 +144,8 @@ _mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS)
    GLbyte srcpixels[4][4];
    GLbyte *blkaddr;
    GLint dstRowDiff;
-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RED_RGTC1 ||
-          dstFormat == MESA_FORMAT_SIGNED_L_LATC1);
+   ASSERT(dstFormat == MESA_FORMAT_R_RGTC1_SNORM ||
+          dstFormat == MESA_FORMAT_L_LATC1_SNORM);
 
    tempImage = _mesa_make_temp_float_image(ctx, dims,
 					   baseInternalFormat,
@@ -192,8 +192,8 @@ _mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS)
    GLubyte *blkaddr;
    GLint dstRowDiff;
 
-   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2 ||
-          dstFormat == MESA_FORMAT_LA_LATC2);
+   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2_UNORM ||
+          dstFormat == MESA_FORMAT_LA_LATC2_UNORM);
 
    tempImage = _mesa_make_temp_ubyte_image(ctx, dims,
 					  baseInternalFormat,
@@ -246,8 +246,8 @@ _mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS)
    GLbyte *blkaddr;
    GLint dstRowDiff;
 
-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RG_RGTC2 ||
-          dstFormat == MESA_FORMAT_SIGNED_LA_LATC2);
+   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2_SNORM ||
+          dstFormat == MESA_FORMAT_LA_LATC2_SNORM);
 
    tempImage = _mesa_make_temp_float_image(ctx, dims,
 					   baseInternalFormat,
@@ -442,21 +442,21 @@ compressed_fetch_func
 _mesa_get_compressed_rgtc_func(mesa_format format)
 {
    switch (format) {
-   case MESA_FORMAT_RED_RGTC1:
+   case MESA_FORMAT_R_RGTC1_UNORM:
       return fetch_red_rgtc1;
-   case MESA_FORMAT_L_LATC1:
+   case MESA_FORMAT_L_LATC1_UNORM:
       return fetch_l_latc1;
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
+   case MESA_FORMAT_R_RGTC1_SNORM:
       return fetch_signed_red_rgtc1;
-   case MESA_FORMAT_SIGNED_L_LATC1:
+   case MESA_FORMAT_L_LATC1_SNORM:
       return fetch_signed_l_latc1;
-   case MESA_FORMAT_RG_RGTC2:
+   case MESA_FORMAT_RG_RGTC2_UNORM:
       return fetch_rg_rgtc2;
-   case MESA_FORMAT_LA_LATC2:
+   case MESA_FORMAT_LA_LATC2_UNORM:
       return fetch_la_latc2;
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
+   case MESA_FORMAT_RG_RGTC2_SNORM:
       return fetch_signed_rg_rgtc2;
-   case MESA_FORMAT_SIGNED_LA_LATC2:
+   case MESA_FORMAT_LA_LATC2_SNORM:
       return fetch_signed_la_latc2;
    default:
       return NULL;
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 5b6eb7dc1a..bda2d8e17a 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -294,23 +294,23 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
       return MESA_FORMAT_RGBA_DXT5;
    case GL_COMPRESSED_RED_RGTC1:
-      return MESA_FORMAT_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_UNORM;
    case GL_COMPRESSED_SIGNED_RED_RGTC1:
-      return MESA_FORMAT_SIGNED_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_SNORM;
    case GL_COMPRESSED_RG_RGTC2:
-      return MESA_FORMAT_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_UNORM;
    case GL_COMPRESSED_SIGNED_RG_RGTC2:
-      return MESA_FORMAT_SIGNED_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_SNORM;
    case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_L_LATC1;
+      return MESA_FORMAT_L_LATC1_UNORM;
    case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_SIGNED_L_LATC1;
+      return MESA_FORMAT_L_LATC1_SNORM;
    case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-      return MESA_FORMAT_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_UNORM;
    case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-      return MESA_FORMAT_SIGNED_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_SNORM;
    case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-      return MESA_FORMAT_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_UNORM;
    case GL_ETC1_RGB8_OES:
       return MESA_FORMAT_ETC1_RGB8;
    case GL_COMPRESSED_RGB8_ETC2:
@@ -575,15 +575,15 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_ALPHA8I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_ALPHA16I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_ALPHA32I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_LUMINANCE8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT8);
@@ -599,15 +599,15 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_LUMINANCE8I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_LUMINANCE16I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_LUMINANCE32I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_LUMINANCE_ALPHA8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT8);
@@ -623,15 +623,15 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_LUMINANCE_ALPHA8I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_LUMINANCE_ALPHA16I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_LUMINANCE_ALPHA32I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_INTENSITY8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT8);
@@ -647,15 +647,15 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_INTENSITY8I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_INTENSITY16I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_INTENSITY32I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
 
    case GL_RGB8UI_EXT:
@@ -674,19 +674,19 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_RGB8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_RGB16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_RGB32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_RGBA8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
@@ -698,13 +698,13 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_RGBA8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_RGBA16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_RGBA32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
 
    case GL_R8:
@@ -714,7 +714,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
 
    case GL_COMPRESSED_RED:
       if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY)
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1);
+         RETURN_IF_SUPPORTED(MESA_FORMAT_R_RGTC1_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_R_UNORM8);
       break;
 
@@ -729,7 +729,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
 
    case GL_COMPRESSED_RG:
       if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY)
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2);
+         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8_UNORM);
       break;
 
@@ -785,22 +785,22 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UINT32);
       break;
    case GL_R8I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SINT8);
       break;
    case GL_RG8I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SINT8);
       break;
    case GL_R16I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SINT16);
       break;
    case GL_RG16I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SINT16);
       break;
    case GL_R32I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SINT32);
       break;
    case GL_RG32I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SINT32);
       break;
 
    case GL_RGB10_A2UI:
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 84e64f04dc..a57c7da45e 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4106,7 +4106,7 @@ get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
       case GL_RGB32UI:
          return MESA_FORMAT_RGB_UINT32;
       case GL_RGB32I:
-         return MESA_FORMAT_RGB_INT32;
+         return MESA_FORMAT_RGB_SINT32;
       default:
          break;
       }
@@ -4122,11 +4122,11 @@ get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
    case GL_RGBA32F_ARB:
       return MESA_FORMAT_RGBA_FLOAT32;
    case GL_RGBA8I_EXT:
-      return MESA_FORMAT_RGBA_INT8;
+      return MESA_FORMAT_RGBA_SINT8;
    case GL_RGBA16I_EXT:
-      return MESA_FORMAT_RGBA_INT16;
+      return MESA_FORMAT_RGBA_SINT16;
    case GL_RGBA32I_EXT:
-      return MESA_FORMAT_RGBA_INT32;
+      return MESA_FORMAT_RGBA_SINT32;
    case GL_RGBA8UI_EXT:
       return MESA_FORMAT_RGBA_UINT8;
    case GL_RGBA16UI_EXT:
@@ -4143,11 +4143,11 @@ get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
    case GL_RG32F:
       return MESA_FORMAT_RG_FLOAT32;
    case GL_RG8I:
-      return MESA_FORMAT_RG_INT8;
+      return MESA_FORMAT_RG_SINT8;
    case GL_RG16I:
-      return MESA_FORMAT_RG_INT16;
+      return MESA_FORMAT_RG_SINT16;
    case GL_RG32I:
-      return MESA_FORMAT_RG_INT32;
+      return MESA_FORMAT_RG_SINT32;
    case GL_RG8UI:
       return MESA_FORMAT_RG_UINT8;
    case GL_RG16UI:
@@ -4164,11 +4164,11 @@ get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
    case GL_R32F:
       return MESA_FORMAT_R_FLOAT32;
    case GL_R8I:
-      return MESA_FORMAT_R_INT8;
+      return MESA_FORMAT_R_SINT8;
    case GL_R16I:
-      return MESA_FORMAT_R_INT16;
+      return MESA_FORMAT_R_SINT16;
    case GL_R32I:
-      return MESA_FORMAT_R_INT32;
+      return MESA_FORMAT_R_SINT32;
    case GL_R8UI:
       return MESA_FORMAT_R_UINT8;
    case GL_R16UI:
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 80b0fd3044..1e4308a040 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2828,10 +2828,10 @@ _mesa_texstore_rgba_int8(TEXSTORE_PARAMS)
       components = 4;
    }
 
-   ASSERT(dstFormat == MESA_FORMAT_R_INT8 ||
-          dstFormat == MESA_FORMAT_RG_INT8 ||
-          dstFormat == MESA_FORMAT_RGB_INT8 ||
-          dstFormat == MESA_FORMAT_RGBA_INT8 ||
+   ASSERT(dstFormat == MESA_FORMAT_R_SINT8 ||
+          dstFormat == MESA_FORMAT_RG_SINT8 ||
+          dstFormat == MESA_FORMAT_RGB_SINT8 ||
+          dstFormat == MESA_FORMAT_RGBA_SINT8 ||
           dstFormat == MESA_FORMAT_A_SINT8 ||
           dstFormat == MESA_FORMAT_I_SINT8 ||
           dstFormat == MESA_FORMAT_L_SINT8 ||
@@ -2899,10 +2899,10 @@ _mesa_texstore_rgba_int16(TEXSTORE_PARAMS)
       components = 4;
    }
 
-   ASSERT(dstFormat == MESA_FORMAT_R_INT16 ||
-          dstFormat == MESA_FORMAT_RG_INT16 ||
-          dstFormat == MESA_FORMAT_RGB_INT16 ||
-          dstFormat == MESA_FORMAT_RGBA_INT16 ||
+   ASSERT(dstFormat == MESA_FORMAT_R_SINT16 ||
+          dstFormat == MESA_FORMAT_RG_SINT16 ||
+          dstFormat == MESA_FORMAT_RGB_SINT16 ||
+          dstFormat == MESA_FORMAT_RGBA_SINT16 ||
           dstFormat == MESA_FORMAT_A_SINT16 ||
           dstFormat == MESA_FORMAT_L_SINT16 ||
           dstFormat == MESA_FORMAT_I_SINT16 ||
@@ -2970,10 +2970,10 @@ _mesa_texstore_rgba_int32(TEXSTORE_PARAMS)
       components = 4;
    }
 
-   ASSERT(dstFormat == MESA_FORMAT_R_INT32 ||
-          dstFormat == MESA_FORMAT_RG_INT32 ||
-          dstFormat == MESA_FORMAT_RGB_INT32 ||
-          dstFormat == MESA_FORMAT_RGBA_INT32 ||
+   ASSERT(dstFormat == MESA_FORMAT_R_SINT32 ||
+          dstFormat == MESA_FORMAT_RG_SINT32 ||
+          dstFormat == MESA_FORMAT_RGB_SINT32 ||
+          dstFormat == MESA_FORMAT_RGBA_SINT32 ||
           dstFormat == MESA_FORMAT_A_SINT32 ||
           dstFormat == MESA_FORMAT_I_SINT32 ||
           dstFormat == MESA_FORMAT_L_SINT32 ||
@@ -3747,14 +3747,14 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_RGB_SNORM16] = _mesa_texstore_signed_rgba_16;
       table[MESA_FORMAT_RGBA_SNORM16] = _mesa_texstore_signed_rgba_16;
       table[MESA_FORMAT_RGBA_UNORM16] = _mesa_texstore_rgba_16;
-      table[MESA_FORMAT_RED_RGTC1] = _mesa_texstore_red_rgtc1;
-      table[MESA_FORMAT_SIGNED_RED_RGTC1] = _mesa_texstore_signed_red_rgtc1;
-      table[MESA_FORMAT_RG_RGTC2] = _mesa_texstore_rg_rgtc2;
-      table[MESA_FORMAT_SIGNED_RG_RGTC2] = _mesa_texstore_signed_rg_rgtc2;
-      table[MESA_FORMAT_L_LATC1] = _mesa_texstore_red_rgtc1;
-      table[MESA_FORMAT_SIGNED_L_LATC1] = _mesa_texstore_signed_red_rgtc1;
-      table[MESA_FORMAT_LA_LATC2] = _mesa_texstore_rg_rgtc2;
-      table[MESA_FORMAT_SIGNED_LA_LATC2] = _mesa_texstore_signed_rg_rgtc2;
+      table[MESA_FORMAT_R_RGTC1_UNORM] = _mesa_texstore_red_rgtc1;
+      table[MESA_FORMAT_R_RGTC1_SNORM] = _mesa_texstore_signed_red_rgtc1;
+      table[MESA_FORMAT_RG_RGTC2_UNORM] = _mesa_texstore_rg_rgtc2;
+      table[MESA_FORMAT_RG_RGTC2_SNORM] = _mesa_texstore_signed_rg_rgtc2;
+      table[MESA_FORMAT_L_LATC1_UNORM] = _mesa_texstore_red_rgtc1;
+      table[MESA_FORMAT_L_LATC1_SNORM] = _mesa_texstore_signed_red_rgtc1;
+      table[MESA_FORMAT_LA_LATC2_UNORM] = _mesa_texstore_rg_rgtc2;
+      table[MESA_FORMAT_LA_LATC2_SNORM] = _mesa_texstore_signed_rg_rgtc2;
       table[MESA_FORMAT_ETC1_RGB8] = _mesa_texstore_etc1_rgb8;
       table[MESA_FORMAT_ETC2_RGB8] = _mesa_texstore_etc2_rgb8;
       table[MESA_FORMAT_ETC2_SRGB8] = _mesa_texstore_etc2_srgb8;
@@ -3809,18 +3809,18 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_LA_SINT16] = _mesa_texstore_rgba_int16;
       table[MESA_FORMAT_LA_SINT32] = _mesa_texstore_rgba_int32;
 
-      table[MESA_FORMAT_R_INT8] = _mesa_texstore_rgba_int8;
-      table[MESA_FORMAT_RG_INT8] = _mesa_texstore_rgba_int8;
-      table[MESA_FORMAT_RGB_INT8] = _mesa_texstore_rgba_int8;
-      table[MESA_FORMAT_RGBA_INT8] = _mesa_texstore_rgba_int8;
-      table[MESA_FORMAT_R_INT16] = _mesa_texstore_rgba_int16;
-      table[MESA_FORMAT_RG_INT16] = _mesa_texstore_rgba_int16;
-      table[MESA_FORMAT_RGB_INT16] = _mesa_texstore_rgba_int16;
-      table[MESA_FORMAT_RGBA_INT16] = _mesa_texstore_rgba_int16;
-      table[MESA_FORMAT_R_INT32] = _mesa_texstore_rgba_int32;
-      table[MESA_FORMAT_RG_INT32] = _mesa_texstore_rgba_int32;
-      table[MESA_FORMAT_RGB_INT32] = _mesa_texstore_rgba_int32;
-      table[MESA_FORMAT_RGBA_INT32] = _mesa_texstore_rgba_int32;
+      table[MESA_FORMAT_R_SINT8] = _mesa_texstore_rgba_int8;
+      table[MESA_FORMAT_RG_SINT8] = _mesa_texstore_rgba_int8;
+      table[MESA_FORMAT_RGB_SINT8] = _mesa_texstore_rgba_int8;
+      table[MESA_FORMAT_RGBA_SINT8] = _mesa_texstore_rgba_int8;
+      table[MESA_FORMAT_R_SINT16] = _mesa_texstore_rgba_int16;
+      table[MESA_FORMAT_RG_SINT16] = _mesa_texstore_rgba_int16;
+      table[MESA_FORMAT_RGB_SINT16] = _mesa_texstore_rgba_int16;
+      table[MESA_FORMAT_RGBA_SINT16] = _mesa_texstore_rgba_int16;
+      table[MESA_FORMAT_R_SINT32] = _mesa_texstore_rgba_int32;
+      table[MESA_FORMAT_RG_SINT32] = _mesa_texstore_rgba_int32;
+      table[MESA_FORMAT_RGB_SINT32] = _mesa_texstore_rgba_int32;
+      table[MESA_FORMAT_RGBA_SINT32] = _mesa_texstore_rgba_int32;
 
       table[MESA_FORMAT_R_UINT8] = _mesa_texstore_rgba_uint8;
       table[MESA_FORMAT_RG_UINT8] = _mesa_texstore_rgba_uint8;
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index dff9d0cc8f..90e9f2f780 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -248,29 +248,29 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
    case MESA_FORMAT_LA_SINT32:
       return PIPE_FORMAT_L32A32_SINT;
 
-   case MESA_FORMAT_R_INT8:
+   case MESA_FORMAT_R_SINT8:
       return PIPE_FORMAT_R8_SINT;
-   case MESA_FORMAT_RG_INT8:
+   case MESA_FORMAT_RG_SINT8:
       return PIPE_FORMAT_R8G8_SINT;
-   case MESA_FORMAT_RGB_INT8:
+   case MESA_FORMAT_RGB_SINT8:
       return PIPE_FORMAT_R8G8B8_SINT;
-   case MESA_FORMAT_RGBA_INT8:
+   case MESA_FORMAT_RGBA_SINT8:
       return PIPE_FORMAT_R8G8B8A8_SINT;
-   case MESA_FORMAT_R_INT16:
+   case MESA_FORMAT_R_SINT16:
       return PIPE_FORMAT_R16_SINT;
-   case MESA_FORMAT_RG_INT16:
+   case MESA_FORMAT_RG_SINT16:
       return PIPE_FORMAT_R16G16_SINT;
-   case MESA_FORMAT_RGB_INT16:
+   case MESA_FORMAT_RGB_SINT16:
       return PIPE_FORMAT_R16G16B16_SINT;
-   case MESA_FORMAT_RGBA_INT16:
+   case MESA_FORMAT_RGBA_SINT16:
       return PIPE_FORMAT_R16G16B16A16_SINT;
-   case MESA_FORMAT_R_INT32:
+   case MESA_FORMAT_R_SINT32:
       return PIPE_FORMAT_R32_SINT;
-   case MESA_FORMAT_RG_INT32:
+   case MESA_FORMAT_RG_SINT32:
       return PIPE_FORMAT_R32G32_SINT;
-   case MESA_FORMAT_RGB_INT32:
+   case MESA_FORMAT_RGB_SINT32:
       return PIPE_FORMAT_R32G32B32_SINT;
-   case MESA_FORMAT_RGBA_INT32:
+   case MESA_FORMAT_RGBA_SINT32:
       return PIPE_FORMAT_R32G32B32A32_SINT;
 
    /* unsigned int formats */
@@ -299,22 +299,22 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
    case MESA_FORMAT_RGBA_UINT32:
       return PIPE_FORMAT_R32G32B32A32_UINT;
 
-   case MESA_FORMAT_RED_RGTC1:
+   case MESA_FORMAT_R_RGTC1_UNORM:
       return PIPE_FORMAT_RGTC1_UNORM;
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
+   case MESA_FORMAT_R_RGTC1_SNORM:
       return PIPE_FORMAT_RGTC1_SNORM;
-   case MESA_FORMAT_RG_RGTC2:
+   case MESA_FORMAT_RG_RGTC2_UNORM:
       return PIPE_FORMAT_RGTC2_UNORM;
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
+   case MESA_FORMAT_RG_RGTC2_SNORM:
       return PIPE_FORMAT_RGTC2_SNORM;
 
-   case MESA_FORMAT_L_LATC1:
+   case MESA_FORMAT_L_LATC1_UNORM:
       return PIPE_FORMAT_LATC1_UNORM;
-   case MESA_FORMAT_SIGNED_L_LATC1:
+   case MESA_FORMAT_L_LATC1_SNORM:
       return PIPE_FORMAT_LATC1_SNORM;
-   case MESA_FORMAT_LA_LATC2:
+   case MESA_FORMAT_LA_LATC2_UNORM:
       return PIPE_FORMAT_LATC2_UNORM;
-   case MESA_FORMAT_SIGNED_LA_LATC2:
+   case MESA_FORMAT_LA_LATC2_SNORM:
       return PIPE_FORMAT_LATC2_SNORM;
 
    case MESA_FORMAT_ETC1_RGB8:
@@ -599,31 +599,31 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
       return MESA_FORMAT_LA_SINT32;
 
    case PIPE_FORMAT_R8_SINT:
-      return MESA_FORMAT_R_INT8;
+      return MESA_FORMAT_R_SINT8;
    case PIPE_FORMAT_R8G8_SINT:
-      return MESA_FORMAT_RG_INT8;
+      return MESA_FORMAT_RG_SINT8;
    case PIPE_FORMAT_R8G8B8_SINT:
-      return MESA_FORMAT_RGB_INT8;
+      return MESA_FORMAT_RGB_SINT8;
    case PIPE_FORMAT_R8G8B8A8_SINT:
-      return MESA_FORMAT_RGBA_INT8;
+      return MESA_FORMAT_RGBA_SINT8;
 
    case PIPE_FORMAT_R16_SINT:
-      return MESA_FORMAT_R_INT16;
+      return MESA_FORMAT_R_SINT16;
    case PIPE_FORMAT_R16G16_SINT:
-      return MESA_FORMAT_RG_INT16;
+      return MESA_FORMAT_RG_SINT16;
    case PIPE_FORMAT_R16G16B16_SINT:
-      return MESA_FORMAT_RGB_INT16;
+      return MESA_FORMAT_RGB_SINT16;
    case PIPE_FORMAT_R16G16B16A16_SINT:
-      return MESA_FORMAT_RGBA_INT16;
+      return MESA_FORMAT_RGBA_SINT16;
 
    case PIPE_FORMAT_R32_SINT:
-      return MESA_FORMAT_R_INT32;
+      return MESA_FORMAT_R_SINT32;
    case PIPE_FORMAT_R32G32_SINT:
-      return MESA_FORMAT_RG_INT32;
+      return MESA_FORMAT_RG_SINT32;
    case PIPE_FORMAT_R32G32B32_SINT:
-      return MESA_FORMAT_RGB_INT32;
+      return MESA_FORMAT_RGB_SINT32;
    case PIPE_FORMAT_R32G32B32A32_SINT:
-      return MESA_FORMAT_RGBA_INT32;
+      return MESA_FORMAT_RGBA_SINT32;
 
    /* unsigned int formats */
    case PIPE_FORMAT_R8_UINT:
@@ -654,22 +654,22 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
       return MESA_FORMAT_RGBA_UINT32;
 
    case PIPE_FORMAT_RGTC1_UNORM:
-      return MESA_FORMAT_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_UNORM;
    case PIPE_FORMAT_RGTC1_SNORM:
-      return MESA_FORMAT_SIGNED_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_SNORM;
    case PIPE_FORMAT_RGTC2_UNORM:
-      return MESA_FORMAT_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_UNORM;
    case PIPE_FORMAT_RGTC2_SNORM:
-      return MESA_FORMAT_SIGNED_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_SNORM;
 
    case PIPE_FORMAT_LATC1_UNORM:
-      return MESA_FORMAT_L_LATC1;
+      return MESA_FORMAT_L_LATC1_UNORM;
    case PIPE_FORMAT_LATC1_SNORM:
-      return MESA_FORMAT_SIGNED_L_LATC1;
+      return MESA_FORMAT_L_LATC1_SNORM;
    case PIPE_FORMAT_LATC2_UNORM:
-      return MESA_FORMAT_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_UNORM;
    case PIPE_FORMAT_LATC2_SNORM:
-      return MESA_FORMAT_SIGNED_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_SNORM;
 
    case PIPE_FORMAT_ETC1_RGB8:
       return MESA_FORMAT_ETC1_RGB8;
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index a6aae909bb..7a3e76f851 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -779,21 +779,21 @@ texfetch_funcs[] =
 
 
    {
-      MESA_FORMAT_R_INT8,
+      MESA_FORMAT_R_SINT8,
       NULL,
       NULL,
       NULL
    },
 
    {
-      MESA_FORMAT_RG_INT8,
+      MESA_FORMAT_RG_SINT8,
       NULL,
       NULL,
       NULL
    },
 
    {
-      MESA_FORMAT_RGB_INT8,
+      MESA_FORMAT_RGB_SINT8,
       NULL,
       NULL,
       NULL
@@ -801,55 +801,55 @@ texfetch_funcs[] =
 
    /* non-normalized, signed int */
    {
-      MESA_FORMAT_RGBA_INT8,
+      MESA_FORMAT_RGBA_SINT8,
       fetch_texel_1d_rgba_int8,
       fetch_texel_2d_rgba_int8,
       fetch_texel_3d_rgba_int8
    },
    {
-      MESA_FORMAT_R_INT16,
+      MESA_FORMAT_R_SINT16,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_RG_INT16,
+      MESA_FORMAT_RG_SINT16,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_RGB_INT16,
+      MESA_FORMAT_RGB_SINT16,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_RGBA_INT16,
+      MESA_FORMAT_RGBA_SINT16,
       fetch_texel_1d_rgba_int16,
       fetch_texel_2d_rgba_int16,
       fetch_texel_3d_rgba_int16
    },
    {
-      MESA_FORMAT_R_INT32,
+      MESA_FORMAT_R_SINT32,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_RG_INT32,
+      MESA_FORMAT_RG_SINT32,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_RGB_INT32,
+      MESA_FORMAT_RGB_SINT32,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_RGBA_INT32,
+      MESA_FORMAT_RGBA_SINT32,
       fetch_texel_1d_rgba_int32,
       fetch_texel_2d_rgba_int32,
       fetch_texel_3d_rgba_int32
@@ -999,49 +999,49 @@ texfetch_funcs[] =
       fetch_texel_3d_rgba_16
    },
    {
-      MESA_FORMAT_RED_RGTC1,
+      MESA_FORMAT_R_RGTC1_UNORM,
       fetch_compressed,
       fetch_compressed,
       fetch_compressed
    },
    {
-      MESA_FORMAT_SIGNED_RED_RGTC1,
+      MESA_FORMAT_R_RGTC1_SNORM,
       fetch_compressed,
       fetch_compressed,
       fetch_compressed
    },
    {
-      MESA_FORMAT_RG_RGTC2,
+      MESA_FORMAT_RG_RGTC2_UNORM,
       fetch_compressed,
       fetch_compressed,
       fetch_compressed
    },
    {
-      MESA_FORMAT_SIGNED_RG_RGTC2,
+      MESA_FORMAT_RG_RGTC2_SNORM,
       fetch_compressed,
       fetch_compressed,
       fetch_compressed
    },
    {
-      MESA_FORMAT_L_LATC1,
+      MESA_FORMAT_L_LATC1_UNORM,
       fetch_compressed,
       fetch_compressed,
       fetch_compressed
    },
    {
-      MESA_FORMAT_SIGNED_L_LATC1,
+      MESA_FORMAT_L_LATC1_SNORM,
       fetch_compressed,
       fetch_compressed,
       fetch_compressed
    },
    {
-      MESA_FORMAT_LA_LATC2,
+      MESA_FORMAT_LA_LATC2_UNORM,
       fetch_compressed,
       fetch_compressed,
       fetch_compressed
    },
    {
-      MESA_FORMAT_SIGNED_LA_LATC2,
+      MESA_FORMAT_LA_LATC2_SNORM,
       fetch_compressed,
       fetch_compressed,
       fetch_compressed
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index 6e43ae9b39..f3048894ea 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -1042,7 +1042,7 @@ static void FETCH(sla8)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_RGBA_INT8 **************************************************/
+/* MESA_FORMAT_RGBA_SINT8 **************************************************/
 
 static void
 FETCH(rgba_int8)(const struct swrast_texture_image *texImage,
@@ -1058,7 +1058,7 @@ FETCH(rgba_int8)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_RGBA_INT16 **************************************************/
+/* MESA_FORMAT_RGBA_SINT16 **************************************************/
 
 static void
 FETCH(rgba_int16)(const struct swrast_texture_image *texImage,
@@ -1074,7 +1074,7 @@ FETCH(rgba_int16)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_RGBA_INT32 **************************************************/
+/* MESA_FORMAT_RGBA_SINT32 **************************************************/
 
 static void
 FETCH(rgba_int32)(const struct swrast_texture_image *texImage,