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

glamor: Hook up EGL DestroyPixmap through the normal wrap chain. 

One less layering violation (EGL should call glamor, if anything, not
the other way around).

v2: Move glamor.c's DestroyPixmap wrapping up above the
    glamor_egl_screen_init() call, since glamor.c's DestroyPixmap
    needs to be the bottom of the stack (it calls fb directly and
    doesn't wrap).  Caught by Michel.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Eric Anholt 2015-10-18 19:26:14 -07:00
parent e91fd30049
commit ff2850424c
5 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glamor/glamor.c
View File

@ -206,9 +206,6 @@ Bool
glamor_destroy_pixmap(PixmapPtr pixmap) glamor_destroy_pixmap(PixmapPtr pixmap)
{ {
if (pixmap->refcnt == 1) { if (pixmap->refcnt == 1) {
#if GLAMOR_HAS_GBM
glamor_egl_destroy_pixmap_image(pixmap);
#endif
glamor_pixmap_destroy_fbo(pixmap); glamor_pixmap_destroy_fbo(pixmap);
} }
@ -461,6 +458,9 @@ glamor_init(ScreenPtr screen, unsigned int flags)
glamor_priv->saved_procs.close_screen = screen->CloseScreen; glamor_priv->saved_procs.close_screen = screen->CloseScreen;
screen->CloseScreen = glamor_close_screen; screen->CloseScreen = glamor_close_screen;
glamor_priv->saved_procs.destroy_pixmap = screen->DestroyPixmap;
screen->DestroyPixmap = glamor_destroy_pixmap;
/* If we are using egl screen, call egl screen init to /* If we are using egl screen, call egl screen init to
* register correct close screen function. */ * register correct close screen function. */
if (flags & GLAMOR_USE_EGL_SCREEN) { if (flags & GLAMOR_USE_EGL_SCREEN) {
@ -615,9 +615,6 @@ glamor_init(ScreenPtr screen, unsigned int flags)
glamor_priv->saved_procs.create_pixmap = screen->CreatePixmap; glamor_priv->saved_procs.create_pixmap = screen->CreatePixmap;
screen->CreatePixmap = glamor_create_pixmap; screen->CreatePixmap = glamor_create_pixmap;
glamor_priv->saved_procs.destroy_pixmap = screen->DestroyPixmap;
screen->DestroyPixmap = glamor_destroy_pixmap;
glamor_priv->saved_procs.get_spans = screen->GetSpans; glamor_priv->saved_procs.get_spans = screen->GetSpans;
screen->GetSpans = glamor_get_spans; screen->GetSpans = glamor_get_spans;

2
glamor/glamor.h
View File

@ -147,8 +147,6 @@ extern _X_EXPORT int glamor_egl_dri3_fd_name_from_tex(ScreenPtr, PixmapPtr,
unsigned int, Bool, unsigned int, Bool,
CARD16 *, CARD32 *); CARD16 *, CARD32 *);
extern void glamor_egl_destroy_pixmap_image(PixmapPtr pixmap);
extern _X_EXPORT void *glamor_egl_get_gbm_device(ScreenPtr screen); extern _X_EXPORT void *glamor_egl_get_gbm_device(ScreenPtr screen);
/* @glamor_supports_pixmap_import_export: Returns whether /* @glamor_supports_pixmap_import_export: Returns whether

33
glamor/glamor_egl.c
View File

@ -78,6 +78,7 @@ struct glamor_egl_screen_private {
int dri3_capable; int dri3_capable;
CloseScreenProcPtr saved_close_screen; CloseScreenProcPtr saved_close_screen;
DestroyPixmapProcPtr saved_destroy_pixmap;
xf86FreeScreenProc *saved_free_screen; xf86FreeScreenProc *saved_free_screen;
}; };
@ -598,20 +599,29 @@ glamor_pixmap_from_fd(ScreenPtr screen,
#endif #endif
} }
void static Bool
glamor_egl_destroy_pixmap_image(PixmapPtr pixmap) glamor_egl_destroy_pixmap(PixmapPtr pixmap)
{ {
struct glamor_pixmap_private *pixmap_priv = ScreenPtr screen = pixmap->drawable.pScreen;
glamor_get_pixmap_private(pixmap); ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_egl_screen_private *glamor_egl =
glamor_egl_get_screen_private(scrn);
Bool ret;
if (pixmap_priv->image) { if (pixmap->refcnt == 1) {
ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen); struct glamor_pixmap_private *pixmap_priv =
struct glamor_egl_screen_private *glamor_egl = glamor_get_pixmap_private(pixmap);
glamor_egl_get_screen_private(scrn);
eglDestroyImageKHR(glamor_egl->display, pixmap_priv->image); if (pixmap_priv->image)
pixmap_priv->image = NULL; eglDestroyImageKHR(glamor_egl->display, pixmap_priv->image);
} }
screen->DestroyPixmap = glamor_egl->saved_destroy_pixmap;
ret = screen->DestroyPixmap(pixmap);
glamor_egl->saved_destroy_pixmap = screen->DestroyPixmap;
screen->DestroyPixmap = glamor_egl_destroy_pixmap;
return ret;
} }
_X_EXPORT void _X_EXPORT void
@ -723,6 +733,9 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
glamor_egl->saved_close_screen = screen->CloseScreen; glamor_egl->saved_close_screen = screen->CloseScreen;
screen->CloseScreen = glamor_egl_close_screen; screen->CloseScreen = glamor_egl_close_screen;
glamor_egl->saved_destroy_pixmap = screen->DestroyPixmap;
screen->DestroyPixmap = glamor_egl_destroy_pixmap;
glamor_ctx->ctx = glamor_egl->context; glamor_ctx->ctx = glamor_egl->context;
glamor_ctx->display = glamor_egl->display; glamor_ctx->display = glamor_egl->display;

5
glamor/glamor_egl_stubs.c
View File

@ -35,11 +35,6 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
{ {
} }
void
glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
{
}
int int
glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen, glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen,
PixmapPtr pixmap, PixmapPtr pixmap,

5
hw/xwayland/xwayland-glamor.c
View File

@ -400,11 +400,6 @@ xwl_screen_init_glamor(struct xwl_screen *xwl_screen,
return TRUE; return TRUE;
} }
void
glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
{
}
int int
glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen, glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen,
PixmapPtr pixmap, PixmapPtr pixmap,