frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Code motion 

No functional change, just rearranging some code to make later commits
more obvious.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2016-03-31 15:50:34 -04:00
parent f523ebb549
commit 0ba4e251a1
2 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
glx/glxdri2.c
View File

@ -97,21 +97,6 @@ struct __GLXDRIdrawable {
XID dri2_id; XID dri2_id;
}; };
static void
__glXDRIdrawableDestroy(__GLXdrawable * drawable)
{
__GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
const __DRIcoreExtension *core = private->screen->core;
FreeResource(private->dri2_id, FALSE);
(*core->destroyDrawable) (private->driDrawable);
__glXDrawableRelease(drawable);
free(private);
}
static void static void
copy_box(__GLXdrawable * drawable, copy_box(__GLXdrawable * drawable,
int dst, int src, int dst, int src,
@ -134,6 +119,24 @@ copy_box(__GLXdrawable * drawable,
} }
} }
/* white lie */
extern glx_func_ptr glXGetProcAddressARB(const char *);
static void
__glXDRIdrawableDestroy(__GLXdrawable * drawable)
{
__GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
const __DRIcoreExtension *core = private->screen->core;
FreeResource(private->dri2_id, FALSE);
(*core->destroyDrawable) (private->driDrawable);
__glXDrawableRelease(drawable);
free(private);
}
static void static void
__glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable, __glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable,
int x, int y, int w, int h) int x, int y, int w, int h)
@ -339,32 +342,6 @@ static __GLXtextureFromPixmap __glXDRItextureFromPixmap = {
__glXDRIreleaseTexImage __glXDRIreleaseTexImage
}; };
static void
__glXDRIscreenDestroy(__GLXscreen * baseScreen)
{
int i;
ScrnInfoPtr pScrn = xf86ScreenToScrn(baseScreen->pScreen);
__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);
}
pScrn->EnterVT = screen->enterVT;
pScrn->LeaveVT = screen->leaveVT;
free(screen);
}
static Bool static Bool
dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned num_attribs, dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned num_attribs,
const uint32_t *attribs, const uint32_t *attribs,
@ -931,8 +908,31 @@ initializeExtensions(__GLXscreen * screen)
} }
} }
/* white lie */ static void
extern glx_func_ptr glXGetProcAddressARB(const char *); __glXDRIscreenDestroy(__GLXscreen * baseScreen)
{
int i;
ScrnInfoPtr pScrn = xf86ScreenToScrn(baseScreen->pScreen);
__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);
}
pScrn->EnterVT = screen->enterVT;
pScrn->LeaveVT = screen->leaveVT;
free(screen);
}
enum { enum {
GLXOPT_VENDOR_LIBRARY, GLXOPT_VENDOR_LIBRARY,

48
glx/glxdriswrast.c
View File

@ -89,6 +89,9 @@ struct __GLXDRIdrawable {
GCPtr swapgc; /* GC for swapping the color buffers */ GCPtr swapgc; /* GC for swapping the color buffers */
}; };
/* white lie */
extern glx_func_ptr glXGetProcAddressARB(const char *);
static void static void
__glXDRIdrawableDestroy(__GLXdrawable * drawable) __glXDRIdrawableDestroy(__GLXdrawable * drawable)
{ {
@ -210,28 +213,6 @@ static __GLXtextureFromPixmap __glXDRItextureFromPixmap = {
__glXDRIreleaseTexImage __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 * static __GLXcontext *
__glXDRIscreenCreateContext(__GLXscreen * baseScreen, __glXDRIscreenCreateContext(__GLXscreen * baseScreen,
__GLXconfig * glxConfig, __GLXconfig * glxConfig,
@ -440,8 +421,27 @@ initializeExtensions(__GLXscreen * screen)
} }
} }
/* white lie */ static void
extern glx_func_ptr glXGetProcAddressARB(const char *); __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 * static __GLXscreen *
__glXDRIscreenProbe(ScreenPtr pScreen) __glXDRIscreenProbe(ScreenPtr pScreen)