From bdfe77444d85cbd0f269ad35388e27c03e654574 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Sun, 5 Jun 2011 01:28:44 +0200 Subject: [PATCH] st/mesa: some more merge fixes --- src/mesa/state_tracker/st_format.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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: -- 2.30.2