aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-14 15:26:50 +0100
committermarha <marha@users.sourceforge.net>2013-01-14 15:26:50 +0100
commitc67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch)
treec197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /mesalib/src/mesa/program
parent8d07c58314685d56a0586d0a437b541ea2b92a54 (diff)
parent2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff)
downloadvcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz
vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2
vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013 Conflicts: mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mesalib/src/mesa/program')
-rw-r--r--mesalib/src/mesa/program/ir_to_mesa.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index d5b9683db..0f7439b3b 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -3061,7 +3061,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader)
}
state->error = glcpp_preprocess(state, &source, &state->info_log,
- &ctx->Extensions, ctx->API);
+ &ctx->Extensions, ctx);
if (ctx->Shader.Flags & GLSL_DUMP) {
printf("GLSL source for %s shader %d:\n",