summaryrefslogtreecommitdiff
path: root/glx/glxscreens.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2009-04-07 16:28:08 -0400
committerKristian Høgsberg <krh@redhat.com>2009-04-07 16:28:26 -0400
commitdf27b870a8db7a5153b18a556fe77efa590f9eee (patch)
tree314be5003e0a1a1de105e67dbd9580d79efe746a /glx/glxscreens.c
parent92562747a0fdbef1dbedf734cb55dd6a9e1d2994 (diff)
Convert remaining GLX LookupIDByType() calls
Diffstat (limited to 'glx/glxscreens.c')
-rw-r--r--glx/glxscreens.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 6f68b066a..2b12049fb 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -254,6 +254,7 @@ AddScreenVisuals(ScreenPtr pScreen, int count, int d)
VisualPtr visuals;
ColormapPtr installedCmap;
DepthPtr depth;
+ int rc;
depth = NULL;
for (i = 0; i < pScreen->numDepths; i++) {
@@ -294,8 +295,10 @@ AddScreenVisuals(ScreenPtr pScreen, int count, int d)
* for all colormaps.
*/
for (i = 0; i < numInstalledCmaps; i++) {
- installedCmap = LookupIDByType (installedCmaps[i], RT_COLORMAP);
- if (!installedCmap)
+ rc = dixLookupResourceByType((pointer *)&installedCmap,
+ installedCmaps[i], RT_COLORMAP,
+ serverClient, DixReadAccess);
+ if (rc != Success)
continue;
j = installedCmap->pVisual - pScreen->visuals;
installedCmap->pVisual = &visuals[j];