diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
| commit | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (patch) | |
| tree | 4b8d3a482e5905f6efb32f5843f1c6fc75d4fe19 /mesalib/src/glsl/standalone_scaffolding.cpp | |
| parent | c3594c6c050a987fb891a1c7cf0c83102fbbec46 (diff) | |
| parent | 5593a3d2f370e3e12a043110bf2e395c938980d6 (diff) | |
| download | vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.gz vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.bz2 vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config git update 3 Oct 2003
Conflicts:
xorg-server/xkeyboard-config/symbols/level3
xorg-server/xkeyboard-config/symbols/level5
Diffstat (limited to 'mesalib/src/glsl/standalone_scaffolding.cpp')
| -rw-r--r-- | mesalib/src/glsl/standalone_scaffolding.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/glsl/standalone_scaffolding.cpp b/mesalib/src/glsl/standalone_scaffolding.cpp index 6dec205f7..b03734c06 100644 --- a/mesalib/src/glsl/standalone_scaffolding.cpp +++ b/mesalib/src/glsl/standalone_scaffolding.cpp @@ -105,6 +105,7 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api) ctx->Extensions.ARB_texture_multisample = true; ctx->Extensions.ARB_texture_query_lod = true; ctx->Extensions.ARB_gpu_shader5 = true; + ctx->Extensions.ARB_texture_gather = true; ctx->Const.GLSLVersion = 120; |