mesa: Fix MESA_FORMAT names containg SIGNED

Update comments. Replace format names containing SIGNED with
SNORM appended w/decoration per the format name spec:

    s/MESA_FORMAT_SIGNED_R8\b/MESA_FORMAT_R_SNORM8/g
    s/MESA_FORMAT_SIGNED_RG88_REV\b/MESA_FORMAT_R8G8_SNORM/g
    s/MESA_FORMAT_SIGNED_RGBX8888\b/MESA_FORMAT_X8B8G8R8_SNORM/g
    s/MESA_FORMAT_SIGNED_RGBA8888\b/MESA_FORMAT_A8B8G8R8_SNORM/g
    s/MESA_FORMAT_SIGNED_RGBA8888_REV\b/MESA_FORMAT_R8G8B8A8_SNORM/g
    s/MESA_FORMAT_SIGNED_R16\b/MESA_FORMAT_R_SNORM16/g
    s/MESA_FORMAT_SIGNED_GR1616\b/MESA_FORMAT_R16G16_SNORM/g
    s/MESA_FORMAT_SIGNED_RGB_16\b/MESA_FORMAT_RGB_SNORM16/g
    s/MESA_FORMAT_SIGNED_RGBA_16\b/MESA_FORMAT_RGBA_SNORM16/g
    s/MESA_FORMAT_SIGNED_A8\b/MESA_FORMAT_A_SNORM8/g
    s/MESA_FORMAT_SIGNED_I8\b/MESA_FORMAT_I_SNORM8/g
    s/MESA_FORMAT_SIGNED_L8\b/MESA_FORMAT_L_SNORM8/g
    s/MESA_FORMAT_SIGNED_A16\b/MESA_FORMAT_A_SNORM16/g
    s/MESA_FORMAT_SIGNED_I16\b/MESA_FORMAT_I_SNORM16/g
    s/MESA_FORMAT_SIGNED_L16\b/MESA_FORMAT_L_SNORM16/g
    s/MESA_FORMAT_SIGNED_AL88\b/MESA_FORMAT_L8A8_SNORM/g
    s/MESA_FORMAT_SIGNED_RG88\b/MESA_FORMAT_G8R8_SNORM/g
    s/MESA_FORMAT_SIGNED_RG1616\b/MESA_FORMAT_G16R16_SNORM/g

3 files changed, 36 insertions, 36 deletions

diff --git a/src/mesa/swrast/s_renderbuffer.c b/src/mesa/swrast/s_renderbuffer.c
index d008f5ca51d..cf5e2230de7 100644
--- a/src/mesa/swrast/s_renderbuffer.c
+++ b/src/mesa/swrast/s_renderbuffer.c
@@ -88,7 +88,7 @@ soft_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
    case GL_RGBA16:
    case GL_RGBA16_SNORM:
       /* for accum buffer */
-      rb->Format = MESA_FORMAT_SIGNED_RGBA_16;
+      rb->Format = MESA_FORMAT_RGBA_SNORM16;
       break;
    case GL_STENCIL_INDEX:
    case GL_STENCIL_INDEX1_EXT:
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index 385d892cf86..a6aae909bb0 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -939,55 +939,55 @@ texfetch_funcs[] =
 
    /* signed, normalized */
    {
-      MESA_FORMAT_SIGNED_R8,
+      MESA_FORMAT_R_SNORM8,
       fetch_texel_1d_signed_r8,
       fetch_texel_2d_signed_r8,
       fetch_texel_3d_signed_r8
    },
    {
-      MESA_FORMAT_SIGNED_RG88_REV,
+      MESA_FORMAT_R8G8_SNORM,
       fetch_texel_1d_signed_rg88_rev,
       fetch_texel_2d_signed_rg88_rev,
       fetch_texel_3d_signed_rg88_rev
    },
    {
-      MESA_FORMAT_SIGNED_RGBX8888,
+      MESA_FORMAT_X8B8G8R8_SNORM,
       fetch_texel_1d_signed_rgbx8888,
       fetch_texel_2d_signed_rgbx8888,
       fetch_texel_3d_signed_rgbx8888
    },
    {
-      MESA_FORMAT_SIGNED_RGBA8888,
+      MESA_FORMAT_A8B8G8R8_SNORM,
       fetch_texel_1d_signed_rgba8888,
       fetch_texel_2d_signed_rgba8888,
       fetch_texel_3d_signed_rgba8888
    },
    {
-      MESA_FORMAT_SIGNED_RGBA8888_REV,
+      MESA_FORMAT_R8G8B8A8_SNORM,
       fetch_texel_1d_signed_rgba8888_rev,
       fetch_texel_2d_signed_rgba8888_rev,
       fetch_texel_3d_signed_rgba8888_rev
    },
    {
-      MESA_FORMAT_SIGNED_R16,
+      MESA_FORMAT_R_SNORM16,
       fetch_texel_1d_signed_r16,
       fetch_texel_2d_signed_r16,
       fetch_texel_3d_signed_r16
    },
    {
-      MESA_FORMAT_SIGNED_GR1616,
+      MESA_FORMAT_R16G16_SNORM,
       fetch_texel_1d_signed_rg1616,
       fetch_texel_2d_signed_rg1616,
       fetch_texel_3d_signed_rg1616
    },
    {
-      MESA_FORMAT_SIGNED_RGB_16,
+      MESA_FORMAT_RGB_SNORM16,
       fetch_texel_1d_signed_rgb_16,
       fetch_texel_2d_signed_rgb_16,
       fetch_texel_3d_signed_rgb_16
    },
    {
-      MESA_FORMAT_SIGNED_RGBA_16,
+      MESA_FORMAT_RGBA_SNORM16,
       fetch_texel_1d_signed_rgba_16,
       fetch_texel_2d_signed_rgba_16,
       fetch_texel_3d_signed_rgba_16
@@ -1113,49 +1113,49 @@ texfetch_funcs[] =
       fetch_compressed
    },
    {
-      MESA_FORMAT_SIGNED_A8,
+      MESA_FORMAT_A_SNORM8,
       fetch_texel_1d_signed_a8,
       fetch_texel_2d_signed_a8,
       fetch_texel_3d_signed_a8
    },
    {
-      MESA_FORMAT_SIGNED_L8,
+      MESA_FORMAT_L_SNORM8,
       fetch_texel_1d_signed_l8,
       fetch_texel_2d_signed_l8,
       fetch_texel_3d_signed_l8
    },
    {
-      MESA_FORMAT_SIGNED_AL88,
+      MESA_FORMAT_L8A8_SNORM,
       fetch_texel_1d_signed_al88,
       fetch_texel_2d_signed_al88,
       fetch_texel_3d_signed_al88
    },
    {
-      MESA_FORMAT_SIGNED_I8,
+      MESA_FORMAT_I_SNORM8,
       fetch_texel_1d_signed_i8,
       fetch_texel_2d_signed_i8,
       fetch_texel_3d_signed_i8
    },
    {
-      MESA_FORMAT_SIGNED_A16,
+      MESA_FORMAT_A_SNORM16,
       fetch_texel_1d_signed_a16,
       fetch_texel_2d_signed_a16,
       fetch_texel_3d_signed_a16
    },
    {
-      MESA_FORMAT_SIGNED_L16,
+      MESA_FORMAT_L_SNORM16,
       fetch_texel_1d_signed_l16,
       fetch_texel_2d_signed_l16,
       fetch_texel_3d_signed_l16
    },
    {
-      MESA_FORMAT_SIGNED_AL1616,
+      MESA_FORMAT_LA_SNORM16,
       fetch_texel_1d_signed_al1616,
       fetch_texel_2d_signed_al1616,
       fetch_texel_3d_signed_al1616
    },
    {
-      MESA_FORMAT_SIGNED_I16,
+      MESA_FORMAT_I_SNORM16,
       fetch_texel_1d_signed_i16,
       fetch_texel_2d_signed_i16,
       fetch_texel_3d_signed_i16
@@ -1293,13 +1293,13 @@ texfetch_funcs[] =
       NULL
    },
    {
-      MESA_FORMAT_SIGNED_RG88,
+      MESA_FORMAT_G8R8_SNORM,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_SIGNED_RG1616,
+      MESA_FORMAT_G16R16_SNORM,
       NULL,
       NULL,
       NULL
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index 1ac94e65f67..6e43ae9b399 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -1153,7 +1153,7 @@ static void FETCH(dudv8)(const struct swrast_texture_image *texImage,
 }
 
 
-/* MESA_FORMAT_SIGNED_R8 ***********************************************/
+/* MESA_FORMAT_R_SNORM8 ***********************************************/
 
 static void FETCH(signed_r8)( const struct swrast_texture_image *texImage,
                               GLint i, GLint j, GLint k, GLfloat *texel )
@@ -1168,7 +1168,7 @@ static void FETCH(signed_r8)( const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_A8 ***********************************************/
+/* MESA_FORMAT_A_SNORM8 ***********************************************/
 
 static void FETCH(signed_a8)( const struct swrast_texture_image *texImage,
                               GLint i, GLint j, GLint k, GLfloat *texel )
@@ -1183,7 +1183,7 @@ static void FETCH(signed_a8)( const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_L8 ***********************************************/
+/* MESA_FORMAT_L_SNORM8 ***********************************************/
 
 static void FETCH(signed_l8)( const struct swrast_texture_image *texImage,
                               GLint i, GLint j, GLint k, GLfloat *texel )
@@ -1198,7 +1198,7 @@ static void FETCH(signed_l8)( const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_I8 ***********************************************/
+/* MESA_FORMAT_I_SNORM8 ***********************************************/
 
 static void FETCH(signed_i8)( const struct swrast_texture_image *texImage,
                               GLint i, GLint j, GLint k, GLfloat *texel )
@@ -1213,7 +1213,7 @@ static void FETCH(signed_i8)( const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_RG88_REV ***********************************************/
+/* MESA_FORMAT_R8G8_SNORM ***********************************************/
 
 static void FETCH(signed_rg88_rev)( const struct swrast_texture_image *texImage,
                                     GLint i, GLint j, GLint k, GLfloat *texel )
@@ -1228,7 +1228,7 @@ static void FETCH(signed_rg88_rev)( const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_AL88 ***********************************************/
+/* MESA_FORMAT_L8A8_SNORM ***********************************************/
 
 static void FETCH(signed_al88)( const struct swrast_texture_image *texImage,
                                 GLint i, GLint j, GLint k, GLfloat *texel )
@@ -1243,7 +1243,7 @@ static void FETCH(signed_al88)( const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_RGBX8888 ***********************************************/
+/* MESA_FORMAT_X8B8G8R8_SNORM ***********************************************/
 
 static void FETCH(signed_rgbx8888)( const struct swrast_texture_image *texImage,
 			            GLint i, GLint j, GLint k, GLfloat *texel )
@@ -1258,7 +1258,7 @@ static void FETCH(signed_rgbx8888)( const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_RGBA8888 ***********************************************/
+/* MESA_FORMAT_A8B8G8R8_SNORM ***********************************************/
 
 static void FETCH(signed_rgba8888)( const struct swrast_texture_image *texImage,
 			            GLint i, GLint j, GLint k, GLfloat *texel )
@@ -1286,7 +1286,7 @@ static void FETCH(signed_rgba8888_rev)( const struct swrast_texture_image *texIm
 
 
 
-/* MESA_FORMAT_SIGNED_R16 ***********************************************/
+/* MESA_FORMAT_R_SNORM16 ***********************************************/
 
 static void
 FETCH(signed_r16)(const struct swrast_texture_image *texImage,
@@ -1302,7 +1302,7 @@ FETCH(signed_r16)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_A16 ***********************************************/
+/* MESA_FORMAT_A_SNORM16 ***********************************************/
 
 static void
 FETCH(signed_a16)(const struct swrast_texture_image *texImage,
@@ -1318,7 +1318,7 @@ FETCH(signed_a16)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_L16 ***********************************************/
+/* MESA_FORMAT_L_SNORM16 ***********************************************/
 
 static void
 FETCH(signed_l16)(const struct swrast_texture_image *texImage,
@@ -1334,7 +1334,7 @@ FETCH(signed_l16)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_I16 ***********************************************/
+/* MESA_FORMAT_I_SNORM16 ***********************************************/
 
 static void
 FETCH(signed_i16)(const struct swrast_texture_image *texImage,
@@ -1350,7 +1350,7 @@ FETCH(signed_i16)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_RG1616 ***********************************************/
+/* MESA_FORMAT_G16R16_SNORM ***********************************************/
 
 static void
 FETCH(signed_rg1616)(const struct swrast_texture_image *texImage,
@@ -1366,7 +1366,7 @@ FETCH(signed_rg1616)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_AL1616 ***********************************************/
+/* MESA_FORMAT_LA_SNORM16 ***********************************************/
 
 static void
 FETCH(signed_al1616)(const struct swrast_texture_image *texImage,
@@ -1382,7 +1382,7 @@ FETCH(signed_al1616)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_RGB_16 ***********************************************/
+/* MESA_FORMAT_RGB_SNORM16 ***********************************************/
 
 static void 
 FETCH(signed_rgb_16)(const struct swrast_texture_image *texImage,
@@ -1398,7 +1398,7 @@ FETCH(signed_rgb_16)(const struct swrast_texture_image *texImage,
 
 
 
-/* MESA_FORMAT_SIGNED_RGBA_16 ***********************************************/
+/* MESA_FORMAT_RGBA_SNORM16 ***********************************************/
 
 static void
 FETCH(signed_rgba_16)(const struct swrast_texture_image *texImage,