mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renderer: Add buffer to flush_damage

Browse Source 
We already have the buffer in the caller, and every no-op implementation
will want to access the buffer. So might as well pass it.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone
2022-01-14 00:03:24 +00:00
parent f8ac6f940f
commit 12675ed19f
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libweston/libweston.h
+2 -1
View File
@@ -926,7 +926,8 @@ struct weston_renderer {
uint32_t width, uint32_t height); uint32_t width, uint32_t height);
void (*repaint_output)(struct weston_output *output, void (*repaint_output)(struct weston_output *output,
pixman_region32_t *output_damage); pixman_region32_t *output_damage);
void (*flush_damage)(struct weston_surface *surface); void (*flush_damage)(struct weston_surface *surface,
struct weston_buffer *buffer);
void (*attach)(struct weston_surface *es, struct weston_buffer *buffer); void (*attach)(struct weston_surface *es, struct weston_buffer *buffer);
void (*surface_set_color)(struct weston_surface *surface, void (*surface_set_color)(struct weston_surface *surface,
float red, float green, float red, float green,
libweston/compositor.c
+4 -3
View File
@@ -2553,9 +2553,10 @@ weston_output_damage(struct weston_output *output)
static void static void
surface_flush_damage(struct weston_surface *surface) surface_flush_damage(struct weston_surface *surface)
{ {
if (surface->buffer_ref.buffer && struct weston_buffer *buffer = surface->buffer_ref.buffer;
wl_shm_buffer_get(surface->buffer_ref.buffer->resource))
surface->compositor->renderer->flush_damage(surface); if (buffer && wl_shm_buffer_get(buffer->resource))
surface->compositor->renderer->flush_damage(surface, buffer);
if (pixman_region32_not_empty(&surface->damage)) if (pixman_region32_not_empty(&surface->damage))
TL_POINT(surface->compositor, "core_flush_damage", TLP_SURFACE(surface), TL_POINT(surface->compositor, "core_flush_damage", TLP_SURFACE(surface),
libweston/noop-renderer.c
+2 -1
View File
@@ -47,7 +47,8 @@ noop_renderer_repaint_output(struct weston_output *output,
} }
static void static void
noop_renderer_flush_damage(struct weston_surface *surface) noop_renderer_flush_damage(struct weston_surface *surface,
struct weston_buffer *buffer)
{ {
} }
libweston/pixman-renderer.c
+2 -1
View File
@@ -598,7 +598,8 @@ pixman_renderer_repaint_output(struct weston_output *output,
} }
static void static void
pixman_renderer_flush_damage(struct weston_surface *surface) pixman_renderer_flush_damage(struct weston_surface *surface,
struct weston_buffer *buffer)
{ {
/* No-op for pixman renderer */ /* No-op for pixman renderer */
} }
libweston/renderer-gl/gl-renderer.c
+8 -4
View File
@@ -1832,12 +1832,12 @@ gl_format_from_internal(GLenum internal_format)
} }
static void static void
gl_renderer_flush_damage(struct weston_surface *surface) gl_renderer_flush_damage(struct weston_surface *surface,
struct weston_buffer *buffer)
{ {
const struct weston_testsuite_quirks *quirks = const struct weston_testsuite_quirks *quirks =
&surface->compositor->test_data.test_quirks; &surface->compositor->test_data.test_quirks;
struct gl_surface_state *gs = get_surface_state(surface); struct gl_surface_state *gs = get_surface_state(surface);
struct weston_buffer *buffer = gs->buffer_ref.buffer;
struct weston_view *view; struct weston_view *view;
bool texture_used; bool texture_used;
pixman_box32_t *rectangles; pixman_box32_t *rectangles;
@@ -3081,7 +3081,7 @@ gl_renderer_surface_copy_content(struct weston_surface *surface,
*(uint32_t *)target = pack_color(format, gs->color); *(uint32_t *)target = pack_color(format, gs->color);
return 0; return 0;
case BUFFER_TYPE_SHM: case BUFFER_TYPE_SHM:
gl_renderer_flush_damage(surface); gl_renderer_flush_damage(surface, gs->buffer_ref.buffer);
/* fall through */ /* fall through */
case BUFFER_TYPE_EGL: case BUFFER_TYPE_EGL:
break; break;
@@ -3228,7 +3228,11 @@ gl_renderer_create_surface(struct weston_surface *surface)
if (surface->buffer_ref.buffer) { if (surface->buffer_ref.buffer) {
gl_renderer_attach(surface, surface->buffer_ref.buffer); gl_renderer_attach(surface, surface->buffer_ref.buffer);
gl_renderer_flush_damage(surface); if (surface->buffer_ref.buffer->resource &&
wl_shm_buffer_get(surface->buffer_ref.buffer->resource)) {
gl_renderer_flush_damage(surface,
surface->buffer_ref.buffer);
}
} }
return 0; return 0;