diff options
| author | Keith Packard <keithp@keithp.com> | 2015-05-11 16:34:48 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-05-11 16:34:48 -0700 |
| commit | c39c3a97508dc384c0757a0990c07b5d7b2fe97a (patch) | |
| tree | cc9758e3d15a407c9f9f710b4596d34f50c4d5c9 /glx/glxdri2.c | |
| parent | 6b65e961894b9ed53066d22cfd218b12c3f361ca (diff) | |
| parent | 7470578520e90b6402b2509cd0c51fd4fd84849f (diff) | |
Merge remote-tracking branch 'ajax/xserver-next'
Diffstat (limited to 'glx/glxdri2.c')
| -rw-r--r-- | glx/glxdri2.c | 3 |
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; |