compositor-drm: Pass the wl_resource to gbm_bo_import()
authorKristian Høgsberg <krh@bitplanet.net>
Wed, 4 Sep 2013 05:27:08 +0000 (22:27 -0700)
committerKristian Høgsberg <krh@bitplanet.net>
Wed, 4 Sep 2013 05:32:52 +0000 (22:32 -0700)
Another silent regression from the wl_resource opaquify effort.  This was
causing our pageflip-to-client-buffer and sprites optimizations to
not kick in.

src/compositor-drm.c

index 4c4b9c6..eb3ec61 100644 (file)
@@ -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;