[mutter/wip/3-monitors-on-nvidia] fixup! wip! renderer/native: start to add stream copy mode

[Ray Strode <halfline src gnome org>]

commit d3d71ff357c24db1ff34a445d65ec9ca111dc9b2
Author: Ray Strode <rstrode redhat com>
Date:   Tue Nov 27 16:14:06 2018 -0500

    fixup! wip! renderer/native: start to add stream copy mode

 src/backends/native/meta-renderer-native.c | 33 ++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)
---
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index afdb3b508..22dc4efe8 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -690,7 +690,7 @@ init_secondary_gpu_state_stream_copy_mode (MetaRendererNative         *renderer_
   if (!init_dumb_fb (&secondary_gpu_state->egl.dumb_fb,
                      gpu_kms,
                      width, height,
-                     GBM_FORMAT_XRGB8888,
+                     DRM_FORMAT_XRGB8888,
                      error))
       goto failed;
 
@@ -2213,21 +2213,38 @@ copy_shared_framebuffer_stream (CoglOnscreen                        *onscreen,
                                 MetaRendererNativeGpuData           *renderer_gpu_data)
 {
   CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
-  CoglOnscreenEGL *onscreen_egl = onscreen->winsys;
-  MetaOnscreenNative *onscreen_native = onscreen_egl->platform;
-  MetaRendererNative *renderer_native = onscreen_native->renderer_native;
-  MetaEgl *egl = meta_renderer_native_get_egl (renderer_native);
+  CoglContext *cogl_context = framebuffer->context;
   int width, height;
   uint8_t *target_data;
+  uint32_t target_drm_format = DRM_FORMAT_XRGB8888;
+  CoglBitmap *dumb_bitmap;
+  CoglPixelFormat cogl_format;
+  gboolean ret;
 
   width = cogl_framebuffer_get_width (framebuffer);
   height = cogl_framebuffer_get_height (framebuffer);
   target_data = secondary_gpu_state->egl.read_pixels;
 
-  meta_renderer_native_gles3_read_pixels (egl,
-                                          renderer_native->gles3,
-                                          width, height,
+  ret = cogl_pixel_format_from_drm_format (target_drm_format,
+                                           &cogl_format,
+                                           NULL);
+  g_assert (ret);
+
+  dumb_bitmap = cogl_bitmap_new_for_data (cogl_context,
+                                          width,
+                                          height,
+                                          cogl_format,
+                                          width * 4,
                                           target_data);
+
+  if (!cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
+                                                 0 /* x */,
+                                                 0 /* y */,
+                                                 COGL_READ_PIXELS_COLOR_BUFFER,
+                                                 dumb_bitmap))
+    g_warning ("Failed to read pixels from primary renderer");
+
+  cogl_object_unref (dumb_bitmap);
 }
 #endif