Revert "[drm] Store color depth in buffers"

This reverts commit 4469b8719e32cb179a4ae792e4aaf1bcf7789618.

It was really only needed for commit
625b82f2c3a4f7aa1ea90133fbbda854bd3c2f8d which we've now
reverted, so revert this one, too.

diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index 34a7a3899b7f7538e01e0e5200ad29aa73d75108..f936d0a6c9e6ccadf7ff39089ef2daa7c41f0ff5 100644 (file)
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -932,8 +932,7 @@ ply_renderer_head_set_scan_out_buffer_to_console (ply_renderer_backend_t *backen
 
   if (!backend->driver_interface->fetch_buffer (backend->driver,
                                                head->console_buffer_id,
-                                               &width, &height, &row_stride,
-                                               NULL))
+                                               &width, &height, &row_stride))
     return false;
 
   if (!backend->driver_interface->map_buffer (backend->driver,

diff --git a/src/plugins/renderers/drm/ply-renderer-driver.h b/src/plugins/renderers/drm/ply-renderer-driver.h
index 5b582c3e8d082e15be18244bde836273eff980cd..a0d6044a8153eb586774e3e416bc56e689e85409 100644 (file)
--- a/src/plugins/renderers/drm/ply-renderer-driver.h
+++ b/src/plugins/renderers/drm/ply-renderer-driver.h
@@ -45,8 +45,7 @@ typedef struct
                            uint32_t               buffer_id,
                            unsigned long         *width,
                            unsigned long         *height,
-                           unsigned long         *row_stride,
-                           unsigned int          *color_depth);
+                           unsigned long         *row_stride);
 
     bool (* map_buffer) (ply_renderer_driver_t *driver,
                          uint32_t               buffer_id);

diff --git a/src/plugins/renderers/drm/ply-renderer-i915-driver.c b/src/plugins/renderers/drm/ply-renderer-i915-driver.c
index 29178c2efb24016bd37c0d26daf76ba360c83aed..907a0613fe47693c4fb49e235fcad22a40746871 100644 (file)
--- a/src/plugins/renderers/drm/ply-renderer-i915-driver.c
+++ b/src/plugins/renderers/drm/ply-renderer-i915-driver.c
@@ -59,7 +59,6 @@ struct _ply_renderer_buffer
   unsigned long width;
   unsigned long height;
   unsigned long row_stride;
-  unsigned int color_depth;
 
   uint32_t added_fb : 1;
 };
@@ -113,8 +112,7 @@ ply_renderer_buffer_new (ply_renderer_driver_t *driver,
                          uint32_t id,
                          unsigned long width,
                          unsigned long height,
-                         unsigned long row_stride,
-                         unsigned int color_depth)
+                         unsigned long row_stride)
 {
   ply_renderer_buffer_t *buffer;
 
@@ -124,10 +122,9 @@ ply_renderer_buffer_new (ply_renderer_driver_t *driver,
   buffer->width = width;
   buffer->height = height;
   buffer->row_stride = row_stride;
-  buffer->color_depth = color_depth;
 
-  ply_trace ("returning %lux%lu buffer with stride %lu and color depth %u",
-             width, height, row_stride, color_depth);
+  ply_trace ("returning %lux%lu buffer with stride %lu",
+             width, height, row_stride);
 
   return buffer;
 }
@@ -193,7 +190,7 @@ ply_renderer_buffer_new_from_id (ply_renderer_driver_t *driver,
     }
 
   buffer = ply_renderer_buffer_new (driver, buffer_object, buffer_id,
-                                    fb->width, fb->height, fb->pitch, fb->depth);
+                                    fb->width, fb->height, fb->pitch);
   drmModeFreeFB (fb);
 
   return buffer;
@@ -216,8 +213,7 @@ fetch_buffer (ply_renderer_driver_t *driver,
               uint32_t               buffer_id,
               unsigned long         *width,
               unsigned long         *height,
-              unsigned long         *row_stride,
-              unsigned int          *color_depth)
+              unsigned long         *row_stride)
 {
   ply_renderer_buffer_t *buffer;
 
@@ -248,11 +244,8 @@ fetch_buffer (ply_renderer_driver_t *driver,
   if (row_stride != NULL)
     *row_stride = buffer->row_stride;
 
-  if (color_depth != NULL)
-    *color_depth = buffer->color_depth;
-
-  ply_trace ("fetched %lux%lu buffer with stride %lu and color depth %u",
-             buffer->width, buffer->height, buffer->row_stride, buffer->color_depth);
+  ply_trace ("fetched %lux%lu buffer with stride %lu",
+             buffer->width, buffer->height, buffer->row_stride);
   return true;
 }
 
@@ -289,7 +282,7 @@ create_buffer (ply_renderer_driver_t *driver,
 
   buffer = ply_renderer_buffer_new (driver,
                                     buffer_object, buffer_id,
-                                    width, height, *row_stride, 24);
+                                    width, height, *row_stride);
   buffer->added_fb = true;
   ply_hashtable_insert (driver->buffers,
                         (void *) (uintptr_t) buffer_id,

diff --git a/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c b/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
index 625df4b9cfc1a33091340a5dc780449e5f85da2c..2cef56eb90f1bf859c478246ff47e4b93ad467b6 100644 (file)
--- a/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
+++ b/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
@@ -60,7 +60,6 @@ struct _ply_renderer_buffer
   unsigned long width;
   unsigned long height;
   unsigned long row_stride;
-  unsigned int color_depth;
 
   uint32_t added_fb : 1;
 };
@@ -111,8 +110,7 @@ ply_renderer_buffer_new (ply_renderer_driver_t *driver,
                          uint32_t id,
                          unsigned long width,
                          unsigned long height,
-                         unsigned long row_stride,
-                         unsigned int color_depth)
+                         unsigned long row_stride)
 {
   ply_renderer_buffer_t *buffer;
 
@@ -122,10 +120,9 @@ ply_renderer_buffer_new (ply_renderer_driver_t *driver,
   buffer->width = width;
   buffer->height = height;
   buffer->row_stride = row_stride;
-  buffer->color_depth = color_depth;
 
-  ply_trace ("returning %lux%lu buffer with stride %lu and color depth %u",
-             width, height, row_stride, color_depth);
+  ply_trace ("returning %lux%lu buffer with stride %lu",
+             width, height, row_stride);
 
   return buffer;
 }
@@ -156,7 +153,7 @@ ply_renderer_buffer_new_from_id (ply_renderer_driver_t *driver,
     }
 
   buffer = ply_renderer_buffer_new (driver, buffer_object, buffer_id,
-                                    fb->width, fb->height, fb->pitch, fb->depth);
+                                    fb->width, fb->height, fb->pitch);
   drmModeFreeFB (fb);
 
   return buffer;
@@ -178,8 +175,7 @@ fetch_buffer (ply_renderer_driver_t *driver,
               uint32_t               buffer_id,
               unsigned long         *width,
               unsigned long         *height,
-              unsigned long         *row_stride,
-              unsigned int          *color_depth)
+              unsigned long         *row_stride)
 {
   ply_renderer_buffer_t *buffer;
 
@@ -210,11 +206,8 @@ fetch_buffer (ply_renderer_driver_t *driver,
   if (row_stride != NULL)
     *row_stride = buffer->row_stride;
 
-  if (color_depth != NULL)
-    *color_depth = buffer->color_depth;
-
-  ply_trace ("fetched %lux%lu buffer with stride %lu and color depth %u",
-             buffer->width, buffer->height, buffer->row_stride, buffer->color_depth);
+  ply_trace ("fetched %lux%lu buffer with stride %lu",
+             buffer->width, buffer->height, buffer->row_stride);
   return true;
 }
 
@@ -258,7 +251,7 @@ create_buffer (ply_renderer_driver_t *driver,
 
   buffer = ply_renderer_buffer_new (driver,
                                     buffer_object, buffer_id,
-                                    width, height, *row_stride, 24);
+                                    width, height, *row_stride);
   buffer->added_fb = true;
   ply_hashtable_insert (driver->buffers,
                         (void *) (uintptr_t) buffer_id,

diff --git a/src/plugins/renderers/drm/ply-renderer-radeon-driver.c b/src/plugins/renderers/drm/ply-renderer-radeon-driver.c
index 62cf8afbafe37f20703402b15da938b79dcbd1a3..36cee4756648641fe43a1b6733d0220ecceaa21f 100644 (file)
--- a/src/plugins/renderers/drm/ply-renderer-radeon-driver.c
+++ b/src/plugins/renderers/drm/ply-renderer-radeon-driver.c
@@ -60,7 +60,6 @@ struct _ply_renderer_buffer
   unsigned long width;
   unsigned long height;
   unsigned long row_stride;
-  unsigned int color_depth;
 
   uint32_t added_fb : 1;
 };
@@ -111,8 +110,7 @@ ply_renderer_buffer_new (ply_renderer_driver_t *driver,
                          uint32_t id,
                          unsigned long width,
                          unsigned long height,
-                         unsigned long row_stride,
-                         unsigned int color_depth)
+                         unsigned long row_stride)
 {
   ply_renderer_buffer_t *buffer;
 
@@ -122,10 +120,9 @@ ply_renderer_buffer_new (ply_renderer_driver_t *driver,
   buffer->width = width;
   buffer->height = height;
   buffer->row_stride = row_stride;
-  buffer->color_depth = color_depth;
 
-  ply_trace ("returning %lux%lu buffer with stride %lu and color depth %u",
-             width, height, row_stride, color_depth);
+  ply_trace ("returning %lux%lu buffer with stride %lu",
+             width, height, row_stride);
 
   return buffer;
 }
@@ -198,7 +195,7 @@ ply_renderer_buffer_new_from_id (ply_renderer_driver_t *driver,
     }
 
   buffer = ply_renderer_buffer_new (driver, buffer_object, buffer_id,
-                                    fb->width, fb->height, fb->pitch, fb->depth);
+                                    fb->width, fb->height, fb->pitch);
   drmModeFreeFB (fb);
 
   return buffer;
@@ -210,8 +207,7 @@ fetch_buffer (ply_renderer_driver_t *driver,
               uint32_t               buffer_id,
               unsigned long         *width,
               unsigned long         *height,
-              unsigned long         *row_stride,
-              unsigned int          *color_depth)
+              unsigned long         *row_stride)
 {
   ply_renderer_buffer_t *buffer;
 
@@ -242,11 +238,8 @@ fetch_buffer (ply_renderer_driver_t *driver,
   if (row_stride != NULL)
     *row_stride = buffer->row_stride;
 
-  if (color_depth != NULL)
-    *color_depth = buffer->color_depth;
-
-  ply_trace ("fetched %lux%lu buffer with stride %lu and color depth %d",
-             buffer->width, buffer->height, buffer->row_stride, buffer->color_depth);
+  ply_trace ("fetched %lux%lu buffer with stride %lu",
+             buffer->width, buffer->height, buffer->row_stride);
   return true;
 }
 
@@ -283,7 +276,7 @@ create_buffer (ply_renderer_driver_t *driver,
 
   buffer = ply_renderer_buffer_new (driver,
                                     buffer_object, buffer_id,
-                                    width, height, *row_stride, 24);
+                                    width, height, *row_stride);
   buffer->added_fb = true;
   ply_hashtable_insert (driver->buffers,
                         (void *) (uintptr_t) buffer_id,