diff options
| author | Martin Andersson <g02maran@gmail.com> | 2013-12-26 10:33:28 +0100 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2014-01-13 15:25:31 +0100 |
| commit | c156d245258842c41d1ffac06a08ee7eeb45b33f (patch) | |
| tree | eaf07dbaa92e1d2cc76dfc89a38f41e32bc9cc71 | |
| parent | 99abb87c63a46c2a0ace6c11076e35a0c2d2bc7e (diff) | |
st/egl: Flush resources before presentation
Fixes wayland regression on r600g due to fast clear introduced by commit
edbbfac6.
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
| -rw-r--r-- | src/gallium/state_trackers/egl/common/native_helper.c | 15 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/common/native_helper.h | 5 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/wayland/native_wayland.c | 4 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/egl/common/native_helper.c b/src/gallium/state_trackers/egl/common/native_helper.c index 4a77a502e87..856cbb6d675 100644 --- a/src/gallium/state_trackers/egl/common/native_helper.c +++ b/src/gallium/state_trackers/egl/common/native_helper.c @@ -341,6 +341,21 @@ resource_surface_throttle(struct resource_surface *rsurf) } boolean +resource_surface_flush_resource(struct resource_surface *rsurf, + struct native_display *ndpy, + enum native_attachment which) +{ + struct pipe_context *pipe = ndpy_get_copy_context(ndpy); + + if (!pipe) + return FALSE; + + pipe->flush_resource(pipe, rsurf->resources[which]); + + return TRUE; +} + +boolean resource_surface_flush(struct resource_surface *rsurf, struct native_display *ndpy) { diff --git a/src/gallium/state_trackers/egl/common/native_helper.h b/src/gallium/state_trackers/egl/common/native_helper.h index 4c369a7ff1a..0b53b286e2d 100644 --- a/src/gallium/state_trackers/egl/common/native_helper.h +++ b/src/gallium/state_trackers/egl/common/native_helper.h @@ -91,6 +91,11 @@ resource_surface_copy_swap(struct resource_surface *rsurf, boolean resource_surface_throttle(struct resource_surface *rsurf); +boolean +resource_surface_flush_resource(struct resource_surface *rsurf, + struct native_display *ndpy, + enum native_attachment which); + /** * Flush pending rendering using the copy context. This function saves a * marker for upcoming throttles. diff --git a/src/gallium/state_trackers/egl/wayland/native_wayland.c b/src/gallium/state_trackers/egl/wayland/native_wayland.c index cfdf4f87044..cb0ce0d1816 100644 --- a/src/gallium/state_trackers/egl/wayland/native_wayland.c +++ b/src/gallium/state_trackers/egl/wayland/native_wayland.c @@ -259,6 +259,10 @@ wayland_surface_swap_buffers(struct native_surface *nsurf) if (ret == -1) return EGL_FALSE; + (void) resource_surface_flush_resource(surface->rsurf, &display->base, + NATIVE_ATTACHMENT_BACK_LEFT); + (void) resource_surface_flush(surface->rsurf, &display->base); + surface->frame_callback = wl_surface_frame(surface->win->surface); wl_callback_add_listener(surface->frame_callback, &frame_listener, surface); wl_proxy_set_queue((struct wl_proxy *) surface->frame_callback, |