aboutsummaryrefslogtreecommitdiffstats
path: root/src/glx/x11/dri_common.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2008-11-15 16:53:24 +0000
committerKeith Whitwell <[email protected]>2008-11-15 16:53:24 +0000
commit7468765b18be202a64d58b83f6267b6973ea4897 (patch)
tree6e9fa6dd4a2ff79787bcae247377d07c00a036cf /src/glx/x11/dri_common.c
parent5e1454a036be6da2c48e2e20bf6f8047ee1a94d3 (diff)
parent80d6379722a1249ce13db79a898d340644936f67 (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: src/mesa/shader/prog_print.c
Diffstat (limited to 'src/glx/x11/dri_common.c')
-rw-r--r--src/glx/x11/dri_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/x11/dri_common.c b/src/glx/x11/dri_common.c
index fcb579f3bf8..4fda649e59a 100644
--- a/src/glx/x11/dri_common.c
+++ b/src/glx/x11/dri_common.c
@@ -340,7 +340,7 @@ driBindExtensions(__GLXscreenConfigs *psc, int dri2)
#ifdef __DRI_COPY_SUB_BUFFER
if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) {
psc->driCopySubBuffer = (__DRIcopySubBufferExtension *) extensions[i];
- __glXEnableDirectExtension(psc, "GLX_MESA_copy_sub_buffer_bit");
+ __glXEnableDirectExtension(psc, "GLX_MESA_copy_sub_buffer");
}
#endif