aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-18 09:53:00 +0100
committermarha <marha@users.sourceforge.net>2013-02-18 09:53:00 +0100
commitb14c3b05e45201bbbbb3a4beba260c3d6ff31003 (patch)
tree0c431930528bbc4eedea72763955cf4cb423bb07 /mesalib/src/mesa
parent2baf3a927a61d2a268fa4202683f193fa7ba2d14 (diff)
parentf51268259621a21d14e40b8a41c5803a5c2ce706 (diff)
downloadvcxsrv-b14c3b05e45201bbbbb3a4beba260c3d6ff31003.tar.gz
vcxsrv-b14c3b05e45201bbbbb3a4beba260c3d6ff31003.tar.bz2
vcxsrv-b14c3b05e45201bbbbb3a4beba260c3d6ff31003.zip
Merge remote-tracking branch 'origin/released'
* origin/released: git update fontconfig libX11 mesa xkeyboard-config 18 Feb 2013
Diffstat (limited to 'mesalib/src/mesa')
-rw-r--r--mesalib/src/mesa/main/getstring.c2
-rw-r--r--mesalib/src/mesa/state_tracker/st_extensions.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/getstring.c b/mesalib/src/mesa/main/getstring.c
index aa3a528fd..5280b4dd3 100644
--- a/mesalib/src/mesa/main/getstring.c
+++ b/mesalib/src/mesa/main/getstring.c
@@ -137,7 +137,7 @@ _mesa_GetString( GLenum name )
if (ctx->API == API_OPENGLES)
break;
return shading_language_version(ctx);
- case GL_PROGRAM_ERROR_STRING_NV:
+ case GL_PROGRAM_ERROR_STRING_ARB:
if (ctx->API == API_OPENGL_COMPAT &&
(ctx->Extensions.ARB_fragment_program ||
ctx->Extensions.ARB_vertex_program)) {
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 4d2d43d7e..11db9d3f3 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -421,6 +421,10 @@ void st_init_extensions(struct st_context *st)
{ { o(EXT_texture_integer) },
{ PIPE_FORMAT_R32G32B32A32_UINT,
PIPE_FORMAT_R32G32B32A32_SINT } },
+
+ { { o(ARB_texture_rg) },
+ { PIPE_FORMAT_R8_UNORM,
+ PIPE_FORMAT_R8G8_UNORM } },
};
/* Required: depth stencil and sampler support */
@@ -444,9 +448,6 @@ void st_init_extensions(struct st_context *st)
PIPE_FORMAT_RGTC2_UNORM,
PIPE_FORMAT_RGTC2_SNORM } },
- { { o(ARB_texture_rg) },
- { PIPE_FORMAT_R8G8_UNORM } },
-
{ { o(EXT_texture_compression_latc) },
{ PIPE_FORMAT_LATC1_UNORM,
PIPE_FORMAT_LATC1_SNORM,