summaryrefslogtreecommitdiff
path: root/glx/glxdriswrast.c
diff options
context:
space:
mode:
Diffstat (limited to 'glx/glxdriswrast.c')
-rw-r--r--glx/glxdriswrast.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 1e46d978f..be3252704 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -89,6 +89,9 @@ struct __GLXDRIdrawable {
GCPtr swapgc; /* GC for swapping the color buffers */
};
+/* white lie */
+extern glx_func_ptr glXGetProcAddressARB(const char *);
+
static void
__glXDRIdrawableDestroy(__GLXdrawable * drawable)
{
@@ -210,28 +213,6 @@ static __GLXtextureFromPixmap __glXDRItextureFromPixmap = {
__glXDRIreleaseTexImage
};
-static void
-__glXDRIscreenDestroy(__GLXscreen * baseScreen)
-{
- int i;
-
- __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen;
-
- (*screen->core->destroyScreen) (screen->driScreen);
-
- dlclose(screen->driver);
-
- __glXScreenDestroy(baseScreen);
-
- if (screen->driConfigs) {
- for (i = 0; screen->driConfigs[i] != NULL; i++)
- free((__DRIconfig **) screen->driConfigs[i]);
- free(screen->driConfigs);
- }
-
- free(screen);
-}
-
static __GLXcontext *
__glXDRIscreenCreateContext(__GLXscreen * baseScreen,
__GLXconfig * glxConfig,
@@ -440,8 +421,27 @@ initializeExtensions(__GLXscreen * screen)
}
}
-/* white lie */
-extern glx_func_ptr glXGetProcAddressARB(const char *);
+static void
+__glXDRIscreenDestroy(__GLXscreen * baseScreen)
+{
+ int i;
+
+ __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen;
+
+ (*screen->core->destroyScreen) (screen->driScreen);
+
+ dlclose(screen->driver);
+
+ __glXScreenDestroy(baseScreen);
+
+ if (screen->driConfigs) {
+ for (i = 0; screen->driConfigs[i] != NULL; i++)
+ free((__DRIconfig **) screen->driConfigs[i]);
+ free(screen->driConfigs);
+ }
+
+ free(screen);
+}
static __GLXscreen *
__glXDRIscreenProbe(ScreenPtr pScreen)