1 files changed, 28 insertions, 28 deletions

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index dff9246..dff9d0c 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -321,36 +321,36 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
       return PIPE_FORMAT_ETC1_RGB8;
 
    /* signed normalized formats */
-   case MESA_FORMAT_SIGNED_R8:
+   case MESA_FORMAT_R_SNORM8:
       return PIPE_FORMAT_R8_SNORM;
-   case MESA_FORMAT_SIGNED_RG88_REV:
+   case MESA_FORMAT_R8G8_SNORM:
       return PIPE_FORMAT_R8G8_SNORM;
-   case MESA_FORMAT_SIGNED_RGBA8888_REV:
+   case MESA_FORMAT_R8G8B8A8_SNORM:
       return PIPE_FORMAT_R8G8B8A8_SNORM;
 
-   case MESA_FORMAT_SIGNED_A8:
+   case MESA_FORMAT_A_SNORM8:
       return PIPE_FORMAT_A8_SNORM;
-   case MESA_FORMAT_SIGNED_L8:
+   case MESA_FORMAT_L_SNORM8:
       return PIPE_FORMAT_L8_SNORM;
-   case MESA_FORMAT_SIGNED_AL88:
+   case MESA_FORMAT_L8A8_SNORM:
       return PIPE_FORMAT_L8A8_SNORM;
-   case MESA_FORMAT_SIGNED_I8:
+   case MESA_FORMAT_I_SNORM8:
       return PIPE_FORMAT_I8_SNORM;
 
-   case MESA_FORMAT_SIGNED_R16:
+   case MESA_FORMAT_R_SNORM16:
       return PIPE_FORMAT_R16_SNORM;
-   case MESA_FORMAT_SIGNED_GR1616:
+   case MESA_FORMAT_R16G16_SNORM:
       return PIPE_FORMAT_R16G16_SNORM;
-   case MESA_FORMAT_SIGNED_RGBA_16:
+   case MESA_FORMAT_RGBA_SNORM16:
       return PIPE_FORMAT_R16G16B16A16_SNORM;
 
-   case MESA_FORMAT_SIGNED_A16:
+   case MESA_FORMAT_A_SNORM16:
       return PIPE_FORMAT_A16_SNORM;
-   case MESA_FORMAT_SIGNED_L16:
+   case MESA_FORMAT_L_SNORM16:
       return PIPE_FORMAT_L16_SNORM;
-   case MESA_FORMAT_SIGNED_AL1616:
+   case MESA_FORMAT_LA_SNORM16:
       return PIPE_FORMAT_L16A16_SNORM;
-   case MESA_FORMAT_SIGNED_I16:
+   case MESA_FORMAT_I_SNORM16:
       return PIPE_FORMAT_I16_SNORM;
 
    case MESA_FORMAT_R9G9B9E5_FLOAT:
@@ -676,36 +676,36 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
 
    /* signed normalized formats */
    case PIPE_FORMAT_R8_SNORM:
-      return MESA_FORMAT_SIGNED_R8;
+      return MESA_FORMAT_R_SNORM8;
    case PIPE_FORMAT_R8G8_SNORM:
-      return MESA_FORMAT_SIGNED_RG88_REV;
+      return MESA_FORMAT_R8G8_SNORM;
    case PIPE_FORMAT_R8G8B8A8_SNORM:
-      return MESA_FORMAT_SIGNED_RGBA8888_REV;
+      return MESA_FORMAT_R8G8B8A8_SNORM;
 
    case PIPE_FORMAT_A8_SNORM:
-      return MESA_FORMAT_SIGNED_A8;
+      return MESA_FORMAT_A_SNORM8;
    case PIPE_FORMAT_L8_SNORM:
-      return MESA_FORMAT_SIGNED_L8;
+      return MESA_FORMAT_L_SNORM8;
    case PIPE_FORMAT_L8A8_SNORM:
-      return MESA_FORMAT_SIGNED_AL88;
+      return MESA_FORMAT_L8A8_SNORM;
    case PIPE_FORMAT_I8_SNORM:
-      return MESA_FORMAT_SIGNED_I8;
+      return MESA_FORMAT_I_SNORM8;
 
    case PIPE_FORMAT_R16_SNORM:
-      return MESA_FORMAT_SIGNED_R16;
+      return MESA_FORMAT_R_SNORM16;
    case PIPE_FORMAT_R16G16_SNORM:
-      return MESA_FORMAT_SIGNED_GR1616;
+      return MESA_FORMAT_R16G16_SNORM;
    case PIPE_FORMAT_R16G16B16A16_SNORM:
-      return MESA_FORMAT_SIGNED_RGBA_16;
+      return MESA_FORMAT_RGBA_SNORM16;
 
    case PIPE_FORMAT_A16_SNORM:
-      return MESA_FORMAT_SIGNED_A16;
+      return MESA_FORMAT_A_SNORM16;
    case PIPE_FORMAT_L16_SNORM:
-      return MESA_FORMAT_SIGNED_L16;
+      return MESA_FORMAT_L_SNORM16;
    case PIPE_FORMAT_L16A16_SNORM:
-      return MESA_FORMAT_SIGNED_AL1616;
+      return MESA_FORMAT_LA_SNORM16;
    case PIPE_FORMAT_I16_SNORM:
-      return MESA_FORMAT_SIGNED_I16;
+      return MESA_FORMAT_I_SNORM16;
 
    case PIPE_FORMAT_R9G9B9E5_FLOAT:
       return MESA_FORMAT_R9G9B9E5_FLOAT;