aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/main.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-27 08:58:51 +0200
committermarha <marha@users.sourceforge.net>2011-06-27 08:58:51 +0200
commit83cb62fe8002927ba95861a4fd21cc44c48bfcf7 (patch)
treef90eaf2bf24e10662389e32a6877c4c95e18229d /mesalib/src/glsl/main.cpp
parente4b391377808d3a264dacdac7db76add26dee26c (diff)
parent0feab87a4300a3e204e259d14a0a63e58e4a3c8f (diff)
downloadvcxsrv-83cb62fe8002927ba95861a4fd21cc44c48bfcf7.tar.gz
vcxsrv-83cb62fe8002927ba95861a4fd21cc44c48bfcf7.tar.bz2
vcxsrv-83cb62fe8002927ba95861a4fd21cc44c48bfcf7.zip
Merge remote-tracking branch 'origin/released'
Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c fontconfig/src/fcmatch.c mesalib/include/GL/internal/dri_interface.h mesalib/src/glsl/main.cpp mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_format.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/blitters-test.c
Diffstat (limited to 'mesalib/src/glsl/main.cpp')
-rw-r--r--mesalib/src/glsl/main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/glsl/main.cpp b/mesalib/src/glsl/main.cpp
index 873a4fa16..54c7099f9 100644
--- a/mesalib/src/glsl/main.cpp
+++ b/mesalib/src/glsl/main.cpp
@@ -87,6 +87,7 @@ initialize_context(struct gl_context *ctx, gl_api api)
ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
ctx->Extensions.EXT_texture_array = GL_TRUE;
ctx->Extensions.NV_texture_rectangle = GL_TRUE;
+ ctx->Extensions.EXT_texture3D = GL_TRUE;
/* GLSL 1.30 isn't fully supported, but we need to advertise 1.30 so that
* the built-in functions for 1.30 can be built.