From: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed, 4 Sep 2013 05:27:08 +0000 (-0700)
Subject: compositor-drm: Pass the wl_resource to gbm_bo_import()
X-Git-Tag: 1.2.91~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6399646a6b10aebd2aaa722d444de72e0639a667;p=platform%2Fupstream%2Fweston.git

compositor-drm: Pass the wl_resource to gbm_bo_import()

Another silent regression from the wl_resource opaquify effort.  This was
causing our pageflip-to-client-buffer and sprites optimizations to
not kick in.
---

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 4c4b9c6..eb3ec61 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -456,7 +456,7 @@ drm_output_prepare_scanout_surface(struct weston_output *_output,
 		return NULL;
 
 	bo = gbm_bo_import(c->gbm, GBM_BO_IMPORT_WL_BUFFER,
-			   buffer, GBM_BO_USE_SCANOUT);
+			   buffer->resource, GBM_BO_USE_SCANOUT);
 
 	/* Unable to use the buffer for scanout */
 	if (!bo)
@@ -822,7 +822,8 @@ drm_output_prepare_overlay_surface(struct weston_output *output_base,
 		return NULL;
 
 	bo = gbm_bo_import(c->gbm, GBM_BO_IMPORT_WL_BUFFER,
-			   es->buffer_ref.buffer, GBM_BO_USE_SCANOUT);
+			   es->buffer_ref.buffer->resource,
+			   GBM_BO_USE_SCANOUT);
 	if (!bo)
 		return NULL;