diff --git a/dix/gc.c b/dix/gc.c
index e84f94882..c5dfe5989 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -831,13 +831,11 @@ FreeGCperDepth(ScreenPtr pScreen)
 }
 
 Bool
-CreateGCperDepth(int screenNum)
+CreateGCperDepth(ScreenPtr pScreen)
 {
-    ScreenPtr pScreen;
     DepthPtr pDepth;
     GCPtr *ppGC;
 
-    pScreen = screenInfo.screens[screenNum];
     ppGC = pScreen->GCperDepth;
     /* do depth 1 separately because it's not included in list */
     if (!(ppGC[0] = CreateScratchGC(pScreen, 1)))
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 01ae13a19..d6f51e52e 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -24,7 +24,7 @@ int FreeGC(void *pGC, XID gid);
 
 void FreeGCperDepth(ScreenPtr pScreen);
 
-Bool CreateGCperDepth(int screenNum);
+Bool CreateGCperDepth(ScreenPtr pScreen);
 
 Bool CreateDefaultStipple(ScreenPtr pScreen);
 
diff --git a/dix/main.c b/dix/main.c
index d993d76f2..c8229dd7a 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -216,7 +216,7 @@ dix_main(int argc, char *argv[], char *envp[])
                 FatalError("failed to create screen pixmap properties");
             if (!dixScreenRaiseCreateResources(pScreen))
                 FatalError("failed to create screen resources");
-            if (!CreateGCperDepth(i))
+            if (!CreateGCperDepth(pScreen))
                 FatalError("failed to create scratch GCs");
             if (!CreateDefaultStipple(pScreen))
                 FatalError("failed to create default stipple");