Commit 7b33c2d3 authored by Michel Dänzer's avatar Michel Dänzer Committed by Michel Dänzer

Revert "xwayland/glamor-gbm: Add xwl_glamor_gbm_post_damage hook"

This reverts commit 9e85aa9c.

To be replaced with a better solution.
Reviewed-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent 1310346d
......@@ -49,7 +49,6 @@
#include "xwayland-glamor.h"
#include "xwayland-pixmap.h"
#include "xwayland-screen.h"
#include "xwayland-window.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
......@@ -920,14 +919,6 @@ xwl_glamor_gbm_has_wl_interfaces(struct xwl_screen *xwl_screen)
return TRUE;
}
static void
xwl_glamor_gbm_post_damage(struct xwl_window *xwl_window, PixmapPtr pixmap,
RegionPtr region)
{
/* Make sure any pending drawing to the pixmap is flushed to the kernel */
glamor_block_handler(xwl_window->xwl_screen->screen);
}
static Bool
xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen)
{
......@@ -1120,6 +1111,5 @@ xwl_glamor_init_gbm(struct xwl_screen *xwl_screen)
xwl_screen->gbm_backend.init_egl = xwl_glamor_gbm_init_egl;
xwl_screen->gbm_backend.init_screen = xwl_glamor_gbm_init_screen;
xwl_screen->gbm_backend.get_wl_buffer_for_pixmap = xwl_glamor_gbm_get_wl_buffer_for_pixmap;
xwl_screen->gbm_backend.post_damage = xwl_glamor_gbm_post_damage;
xwl_screen->gbm_backend.is_available = TRUE;
}
......@@ -124,7 +124,8 @@ xwl_glamor_post_damage(struct xwl_window *xwl_window,
{
struct xwl_screen *xwl_screen = xwl_window->xwl_screen;
xwl_screen->egl_backend->post_damage(xwl_window, pixmap, region);
if (xwl_screen->egl_backend->post_damage)
xwl_screen->egl_backend->post_damage(xwl_window, pixmap, region);
}
Bool
......
......@@ -70,8 +70,10 @@ struct xwl_egl_backend {
Bool *created);
/* Called by Xwayland to perform any pre-wl_surface damage routines
* that are required by the backend to make sure any pending drawing
* operations to the pixmap will be visible to the Wayland server.
* that are required by the backend. If your backend is poorly
* designed and lacks the ability to render directly to a surface,
* you should implement blitting from the glamor pixmap to the wayland
* pixmap here. Otherwise, this callback is optional.
*/
void (*post_damage)(struct xwl_window *xwl_window,
PixmapPtr pixmap, RegionPtr region);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment