summaryrefslogtreecommitdiff
path: root/glx
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2012-04-10 15:47:33 +0100
committerDave Airlie <airlied@redhat.com>2012-05-21 12:59:08 +0100
commit41151f88a62f01b00c1912822b8b430df1eb307e (patch)
tree05e6e63e1d5ece45b5a37c3dc049d6d82351acb5 /glx
parent53932b3803fa2c02949fd7d4d0e433ea58fa89f1 (diff)
xf86: migrate to using xf86ScreenToScrn wrapper (v2)
migrate to new helper API. This just wraps all the obvious uses of xf86Screens[pScreen->myNum], and should be fairly simple to review. v2: remove commented out lines. Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'glx')
-rw-r--r--glx/glxdri.c2
-rw-r--r--glx/glxdri2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/glx/glxdri.c b/glx/glxdri.c
index 9b8b66f0c..b2209c551 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -961,7 +961,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/glx/glxdri2.c b/glx/glxdri2.c
index aa38295fa..cceb12697 100644
--- a/glx/glxdri2.c
+++ b/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)