st/mesa: some more merge fixes

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 72d5a25336e6028313fd66ed2d8d0f32172a2b50..35835712547824c00fb45662ede6b1328e22c673 100644 (file)
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -514,8 +514,8 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
       return MESA_FORMAT_SIGNED_L_LATC1;
    case PIPE_FORMAT_LATC2_UNORM:
       return MESA_FORMAT_LA_LATC2;
-   //case PIPE_FORMAT_LATC2_SNORM:
-   //   return MESA_FORMAT_SIGNED_LA_LATC2;
+   case PIPE_FORMAT_LATC2_SNORM:
+      return MESA_FORMAT_SIGNED_LA_LATC2;
 
    /* signed normalized formats */
    case PIPE_FORMAT_R8_SNORM: