From 6ec39db726beead21d97bf64ddbe1f0b2d2d6ca1 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri, 23 Jul 2010 16:15:31 -0400
Subject: glx: Refactor and simplify context creation

This lets us better separate context creation between the different
backends.
---
 src/glx/glxext.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/glx/glxext.c')

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 324230f5e3..f9a5f7ce5d 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -738,21 +738,6 @@ glx_screen_init(__GLXscreenConfigs *psc,
    return GL_TRUE;
 }
 
-static __GLXscreenConfigs *
-createIndirectScreen(int screen, __GLXdisplayPrivate * priv)
-{
-   __GLXscreenConfigs *psc;
-
-   psc = Xmalloc(sizeof *psc);
-   if (psc == NULL)
-      return NULL;
-
-   memset(psc, 0, sizeof *psc);
-   glx_screen_init(psc, screen, priv);
-
-   return psc;
-}
-
 /*
 ** Allocate the memory for the per screen configs for each screen.
 ** If that works then fetch the per screen configs data.
@@ -789,7 +774,7 @@ AllocAndFetchScreenConfigs(Display * dpy, __GLXdisplayPrivate * priv)
 	 psc = (*priv->driswDisplay->createScreen) (i, priv);
 #endif
       if (psc == NULL)
-	 psc = createIndirectScreen (i, priv);
+	 psc = indirect_create_screen(i, priv);
       priv->screenConfigs[i] = psc;
    }
    SyncHandle();
-- 
cgit v1.2.3