projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
129a3c1
)
st/mesa: some more merge fixes
author
Christian König
<deathsimple@vodafone.de>
Sat, 4 Jun 2011 23:28:44 +0000
(
01:28
+0200)
committer
Christian König
<deathsimple@vodafone.de>
Sat, 4 Jun 2011 23:28:44 +0000
(
01:28
+0200)
src/mesa/state_tracker/st_format.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_format.c
b/src/mesa/state_tracker/st_format.c
index
72d5a25
..
3583571
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: