diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-25 15:31:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-25 15:31:52 +0200 |
| commit | e37e5c7e6678395a7f5dff1aea1c240a5b1c8f66 (patch) | |
| tree | 9e46ba338311cb6658589a7767ebcb7f525eb369 /xorg-server/glx | |
| parent | aebbd673a0fb4d5e9ae4e8e690b29fb364376875 (diff) | |
| parent | eef864d36de97903007f04fad9fa43afe297745b (diff) | |
| download | vcxsrv-e37e5c7e6678395a7f5dff1aea1c240a5b1c8f66.tar.gz vcxsrv-e37e5c7e6678395a7f5dff1aea1c240a5b1c8f66.tar.bz2 vcxsrv-e37e5c7e6678395a7f5dff1aea1c240a5b1c8f66.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/glxdri.c | 2 | ||||
| -rw-r--r-- | xorg-server/glx/glxdri2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c index f256949c3..9bf20315b 100644 --- a/xorg-server/glx/glxdri.c +++ b/xorg-server/glx/glxdri.c @@ -964,7 +964,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) __GLXDRIscreen *screen; Bool isCapable; size_t buffer_size; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) { diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c index aa38295fa..cceb12697 100644 --- a/xorg-server/glx/glxdri2.c +++ b/xorg-server/glx/glxdri2.c @@ -686,7 +686,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) const char *driverName, *deviceName; __GLXDRIscreen *screen; size_t buffer_size; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); screen = calloc(1, sizeof *screen); if (screen == NULL) |