From: Christian König <deathsimple@vodafone.de>
Date: Sat, 4 Jun 2011 23:28:44 +0000 (+0200)
Subject: st/mesa: some more merge fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bdfe77444d85cbd0f269ad35388e27c03e654574;p=mesa.git

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 72d5a25336e..35835712547 100644
--- 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: