diff options
| author | Christian König <[email protected]> | 2011-06-05 01:28:44 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-06-05 01:28:44 +0200 |
| commit | bdfe77444d85cbd0f269ad35388e27c03e654574 (patch) | |
| tree | 51b026c208dcdc567183068477d80578be677e01 /src | |
| parent | 129a3c1cf0f9174d32db022b970ffb2127450ff9 (diff) | |
st/mesa: some more merge fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/state_tracker/st_format.c | 4 |
1 files 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: |