summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2015-03-04 12:16:29 +0000
committerAdam Jackson <ajax@redhat.com>2015-05-07 14:06:04 -0400
commitd61ae18074e53c2cdfb13cc37693b526160d6ca7 (patch)
tree92ff1dde653d973f9468a08d780ff485489844d0
parent1af15aaf278edcf6f6de94774350e34a80883c24 (diff)
glx/dri2: Disable AIGLX if indirect GLX is disabled
There is no point in setting up the acceleration for indirect GLX if indirect GLX is itself disabled. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--glx/glxdri2.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index bcd57a4a3..c0f29ea31 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -936,6 +936,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
size_t buffer_size;
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ if (!enableIndirectGLX)
+ return NULL;
+
screen = calloc(1, sizeof *screen);
if (screen == NULL)
return NULL;