Merge branch '7.8'

[mesa.git] / src / glx / dri2_glx.c

diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 9347611e7d8b5fb4de65d249c70dc9feb8d471e8..6058c721da7a8efe6cb201a578b0f918d92a226b 100644 (file)
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -30,7 +30,7 @@
  *   Kristian Høgsberg (krh@redhat.com)
  */
 
-#ifdef GLX_DIRECT_RENDERING
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xfixes.h>
@@ -194,6 +194,7 @@ dri2CreateDrawable(__GLXscreenConfigs * psc,
    pdraw->base.psc = psc;
    pdraw->bufferCount = 0;
    pdraw->swap_interval = 1; /* default may be overridden below */
+   pdraw->have_back = 0;
 
    if (psc->config)
       psc->config->configQueryi(psc->__driScreen, "vblank_mode", &vblank_mode);