diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
| commit | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (patch) | |
| tree | 0298f6e38550e2f888eab0146ce7a51a49faaa10 /mesalib/src/mesa/main/context.c | |
| parent | 0e68f72b7b0ab957a0d3c9415f68e3c4f484b0b3 (diff) | |
| parent | bee9191042416cbfb848615189ca1e2a0069f022 (diff) | |
| download | vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.gz vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.bz2 vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index b20063c33..2532c47de 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -627,6 +627,7 @@ _mesa_init_constants(struct gl_context *ctx) /* Shading language version */ if (ctx->API == API_OPENGL) { ctx->Const.GLSLVersion = 120; + _mesa_override_glsl_version(ctx); } else if (ctx->API == API_OPENGLES2) { ctx->Const.GLSLVersion = 100; |