[cairo] [PATCH 33/54] drm: fixed calls to surface backend flush() operations

Enrico Weigelt, metux IT consult enrico.weigelt at gr13.net
Wed Dec 23 02:23:17 PST 2015


Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt at gr13.net>
---
 src/drm/cairo-drm-i965-surface.c   | 2 +-
 src/drm/cairo-drm-intel-surface.c  | 4 ++--
 src/drm/cairo-drm-radeon-surface.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/drm/cairo-drm-i965-surface.c b/src/drm/cairo-drm-i965-surface.c
index 45ba28e..29a21cc 100644
--- a/src/drm/cairo-drm-i965-surface.c
+++ b/src/drm/cairo-drm-i965-surface.c
@@ -703,7 +703,7 @@ i965_surface_flush (void *abstract_surface, unsigned flags)
 	return CAIRO_STATUS_SUCCESS;
 
     if (surface->intel.drm.fallback != NULL)
-	return intel_surface_flush (abstract_surface);
+	return intel_surface_flush (&(surface->intel), flags);
 
     /* Forgo flushing on finish as the user cannot access the surface directly. */
     if (! surface->intel.drm.base.finished &&
diff --git a/src/drm/cairo-drm-intel-surface.c b/src/drm/cairo-drm-intel-surface.c
index 8f6502e..2b9509f 100644
--- a/src/drm/cairo-drm-intel-surface.c
+++ b/src/drm/cairo-drm-intel-surface.c
@@ -90,7 +90,7 @@ intel_surface_acquire_source_image (void *abstract_surface,
 	goto DONE;
 
     if (surface->drm.base.backend->flush != NULL) {
-	status = surface->drm.base.backend->flush (surface);
+	status = surface->drm.base.backend->flush (surface, 0);
 	if (unlikely (status))
 	    return status;
     }
@@ -136,7 +136,7 @@ intel_surface_map_to_image (void *abstract_surface)
 	void *ptr;
 
 	if (surface->drm.base.backend->flush != NULL) {
-	    status = surface->drm.base.backend->flush (surface);
+	    status = surface->drm.base.backend->flush (surface, 0);
 	    if (unlikely (status))
 		return _cairo_surface_create_in_error (status);
 	}
diff --git a/src/drm/cairo-drm-radeon-surface.c b/src/drm/cairo-drm-radeon-surface.c
index 1b8190f..f0c0677 100644
--- a/src/drm/cairo-drm-radeon-surface.c
+++ b/src/drm/cairo-drm-radeon-surface.c
@@ -80,7 +80,7 @@ radeon_surface_acquire_source_image (void *abstract_surface,
 	goto DONE;
 
     if (surface->base.base.backend->flush != NULL) {
-	status = surface->base.base.backend->flush (surface);
+	status = surface->base.base.backend->flush (surface, 0);
 	if (unlikely (status))
 	    return status;
     }
@@ -117,7 +117,7 @@ radeon_surface_map_to_image (radeon_surface_t *surface)
 	void *ptr;
 
 	if (surface->base.base.backend->flush != NULL) {
-	    status = surface->base.base.backend->flush (surface);
+	    status = surface->base.base.backend->flush (surface, 0);
 	    if (unlikely (status))
 		return _cairo_surface_create_in_error (status);
 	}
-- 
2.6.4.442.g545299f



More information about the cairo mailing list