aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-21 14:43:05 +0200
committermarha <marha@users.sourceforge.net>2011-06-21 14:43:05 +0200
commit6bf5e6441da930ba3c1541f4e5e61ef7e6866b35 (patch)
tree0cac64c1f2404632d76fb87895d60eff1cd53651 /mesalib/src/mesa
parent2fcbb7316a41857c67cd6bd1667853a2ff6b2fb9 (diff)
parent8a49ff701cfa50f9dcb237051e2ba7ac0302a515 (diff)
downloadvcxsrv-6bf5e6441da930ba3c1541f4e5e61ef7e6866b35.tar.gz
vcxsrv-6bf5e6441da930ba3c1541f4e5e61ef7e6866b35.tar.bz2
vcxsrv-6bf5e6441da930ba3c1541f4e5e61ef7e6866b35.zip
Merge remote-tracking branch 'origin/released'
Conflicts: fontconfig/doc/fcformat.fncs fontconfig/fc-cat/fc-cat.c fontconfig/fc-list/fc-list.c fontconfig/fc-match/fc-match.c fontconfig/src/fcdir.c fontconfig/src/fcformat.c fontconfig/src/fcname.c mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_format.c
Diffstat (limited to 'mesalib/src/mesa')
-rw-r--r--mesalib/src/mesa/state_tracker/st_format.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index dcd6ea5cc..74e46aa02 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -608,7 +608,7 @@ struct format_mapping
* Multiple GL enums might map to multiple pipe_formats.
* The first pipe format in the list that's supported is the one that's chosen.
*/
-static struct format_mapping format_map[] = {
+static const struct format_mapping format_map[] = {
/* Basic RGB, RGBA formats */
{
{ GL_RGB10, GL_RGB10_A2, 0 },
@@ -616,7 +616,7 @@ static struct format_mapping format_map[] = {
},
{
{ 4, GL_RGBA, GL_RGBA8, 0 },
- { DEFAULT_RGBA_FORMATS, 0 }
+ { DEFAULT_RGBA_FORMATS }
},
{
{ GL_BGRA, 0 },
@@ -624,7 +624,7 @@ static struct format_mapping format_map[] = {
},
{
{ 3, GL_RGB, GL_RGB8, 0 },
- { DEFAULT_RGB_FORMATS, 0 }
+ { DEFAULT_RGB_FORMATS }
},
{
{ GL_RGB12, GL_RGB16, GL_RGBA12, GL_RGBA16, 0 },