aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-18 09:48:46 +0100
committermarha <marha@users.sourceforge.net>2013-02-18 09:48:46 +0100
commitf51268259621a21d14e40b8a41c5803a5c2ce706 (patch)
tree50731770e341e8cd29a37e412ff469eba1037279 /mesalib/src/mesa/main
parent6f6a2340d40759b77ef43965efdd24f3e4e623fd (diff)
downloadvcxsrv-f51268259621a21d14e40b8a41c5803a5c2ce706.tar.gz
vcxsrv-f51268259621a21d14e40b8a41c5803a5c2ce706.tar.bz2
vcxsrv-f51268259621a21d14e40b8a41c5803a5c2ce706.zip
git update fontconfig libX11 mesa xkeyboard-config 18 Feb 2013
xkeyboard-config commit 5102e074fea319c10243579955b64366f11009fd libX11 commit deedeada53676ee529d700bf96fde0b29a3a1def fontconfig commit 2c696255749683e9a084f797eb033d222510a275 mesa commit dd599188d2868838541859a76800a8420958d358
Diffstat (limited to 'mesalib/src/mesa/main')
-rw-r--r--mesalib/src/mesa/main/getstring.c2
1 files changed, 1 insertions, 1 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)) {