Merge pull request #24 from wlrfx/wlroots-0.17-rebase

Rebase to wlroots 0.17

1 files changed, 236 insertions, 162 deletions

diff --git a/render/pixel_format.c b/render/pixel_format.c
index 46bcecf..b81f561 100644
--- a/render/pixel_format.c
+++ b/render/pixel_format.c
@@ -1,178 +1,252 @@
-#include "render/pixel_format.h"
+#include <assert.h>
 #include <drm_fourcc.h>
+#include <wlr/util/log.h>
+#include "render/pixel_format.h"
 
 static const struct wlr_pixel_format_info pixel_format_info[] = {
-    {
-        .drm_format = DRM_FORMAT_XRGB8888,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_ARGB8888,
-        .opaque_substitute = DRM_FORMAT_XRGB8888,
-        .bpp = 32,
-        .has_alpha = true,
-    },
-    {
-        .drm_format = DRM_FORMAT_XBGR8888,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_ABGR8888,
-        .opaque_substitute = DRM_FORMAT_XBGR8888,
-        .bpp = 32,
-        .has_alpha = true,
-    },
-    {
-        .drm_format = DRM_FORMAT_RGBX8888,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_RGBA8888,
-        .opaque_substitute = DRM_FORMAT_RGBX8888,
-        .bpp = 32,
-        .has_alpha = true,
-    },
-    {
-        .drm_format = DRM_FORMAT_BGRX8888,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_BGRA8888,
-        .opaque_substitute = DRM_FORMAT_BGRX8888,
-        .bpp = 32,
-        .has_alpha = true,
-    },
-    {
-        .drm_format = DRM_FORMAT_BGR888,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 24,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_RGBX4444,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 16,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_RGBA4444,
-        .opaque_substitute = DRM_FORMAT_RGBX4444,
-        .bpp = 16,
-        .has_alpha = true,
-    },
-    {
-        .drm_format = DRM_FORMAT_RGBX5551,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 16,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_RGBA5551,
-        .opaque_substitute = DRM_FORMAT_RGBX5551,
-        .bpp = 16,
-        .has_alpha = true,
-    },
-    {
-        .drm_format = DRM_FORMAT_RGB565,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 16,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_BGR565,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 16,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_XRGB2101010,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_ARGB2101010,
-        .opaque_substitute = DRM_FORMAT_XRGB2101010,
-        .bpp = 32,
-        .has_alpha = true,
-    },
-    {
-        .drm_format = DRM_FORMAT_XBGR2101010,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 32,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_ABGR2101010,
-        .opaque_substitute = DRM_FORMAT_XBGR2101010,
-        .bpp = 32,
-        .has_alpha = true,
-    },
-    {
-        .drm_format = DRM_FORMAT_XBGR16161616F,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 64,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_ABGR16161616F,
-        .opaque_substitute = DRM_FORMAT_XBGR16161616F,
-        .bpp = 64,
-        .has_alpha = true,
-    },
-    {
-        .drm_format = DRM_FORMAT_XBGR16161616,
-        .opaque_substitute = DRM_FORMAT_INVALID,
-        .bpp = 64,
-        .has_alpha = false,
-    },
-    {
-        .drm_format = DRM_FORMAT_ABGR16161616,
-        .opaque_substitute = DRM_FORMAT_XBGR16161616,
-        .bpp = 64,
-        .has_alpha = true,
-    },
+	{
+		.drm_format = DRM_FORMAT_XRGB8888,
+		.bytes_per_block = 4,
+	},
+	{
+		.drm_format = DRM_FORMAT_ARGB8888,
+		.opaque_substitute = DRM_FORMAT_XRGB8888,
+		.bytes_per_block = 4,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_XBGR8888,
+		.bytes_per_block = 4,
+	},
+	{
+		.drm_format = DRM_FORMAT_ABGR8888,
+		.opaque_substitute = DRM_FORMAT_XBGR8888,
+		.bytes_per_block = 4,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_RGBX8888,
+		.bytes_per_block = 4,
+	},
+	{
+		.drm_format = DRM_FORMAT_RGBA8888,
+		.opaque_substitute = DRM_FORMAT_RGBX8888,
+		.bytes_per_block = 4,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_BGRX8888,
+		.bytes_per_block = 4,
+	},
+	{
+		.drm_format = DRM_FORMAT_BGRA8888,
+		.opaque_substitute = DRM_FORMAT_BGRX8888,
+		.bytes_per_block = 4,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_R8,
+		.bytes_per_block = 1,
+	},
+	{
+		.drm_format = DRM_FORMAT_GR88,
+		.bytes_per_block = 2,
+	},
+	{
+		.drm_format = DRM_FORMAT_RGB888,
+		.bytes_per_block = 3,
+	},
+	{
+		.drm_format = DRM_FORMAT_BGR888,
+		.bytes_per_block = 3,
+	},
+	{
+		.drm_format = DRM_FORMAT_RGBX4444,
+		.bytes_per_block = 2,
+	},
+	{
+		.drm_format = DRM_FORMAT_RGBA4444,
+		.opaque_substitute = DRM_FORMAT_RGBX4444,
+		.bytes_per_block = 2,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_BGRX4444,
+		.bytes_per_block = 2,
+	},
+	{
+		.drm_format = DRM_FORMAT_BGRA4444,
+		.opaque_substitute = DRM_FORMAT_BGRX4444,
+		.bytes_per_block = 2,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_RGBX5551,
+		.bytes_per_block = 2,
+	},
+	{
+		.drm_format = DRM_FORMAT_RGBA5551,
+		.opaque_substitute = DRM_FORMAT_RGBX5551,
+		.bytes_per_block = 2,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_BGRX5551,
+		.bytes_per_block = 2,
+	},
+	{
+		.drm_format = DRM_FORMAT_BGRA5551,
+		.opaque_substitute = DRM_FORMAT_BGRX5551,
+		.bytes_per_block = 2,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_XRGB1555,
+		.bytes_per_block = 2,
+	},
+	{
+		.drm_format = DRM_FORMAT_ARGB1555,
+		.opaque_substitute = DRM_FORMAT_XRGB1555,
+		.bytes_per_block = 2,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_RGB565,
+		.bytes_per_block = 2,
+	},
+	{
+		.drm_format = DRM_FORMAT_BGR565,
+		.bytes_per_block = 2,
+	},
+	{
+		.drm_format = DRM_FORMAT_XRGB2101010,
+		.bytes_per_block = 4,
+	},
+	{
+		.drm_format = DRM_FORMAT_ARGB2101010,
+		.opaque_substitute = DRM_FORMAT_XRGB2101010,
+		.bytes_per_block = 4,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_XBGR2101010,
+		.bytes_per_block = 4,
+	},
+	{
+		.drm_format = DRM_FORMAT_ABGR2101010,
+		.opaque_substitute = DRM_FORMAT_XBGR2101010,
+		.bytes_per_block = 4,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_XBGR16161616F,
+		.bytes_per_block = 8,
+	},
+	{
+		.drm_format = DRM_FORMAT_ABGR16161616F,
+		.opaque_substitute = DRM_FORMAT_XBGR16161616F,
+		.bytes_per_block = 8,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_XBGR16161616,
+		.bytes_per_block = 8,
+	},
+	{
+		.drm_format = DRM_FORMAT_ABGR16161616,
+		.opaque_substitute = DRM_FORMAT_XBGR16161616,
+		.bytes_per_block = 8,
+		.has_alpha = true,
+	},
+	{
+		.drm_format = DRM_FORMAT_YVYU,
+		.bytes_per_block = 4,
+		.block_width = 2,
+		.block_height = 1,
+	},
+	{
+		.drm_format = DRM_FORMAT_VYUY,
+		.bytes_per_block = 4,
+		.block_width = 2,
+		.block_height = 1,
+	},
 };
 
 static const size_t pixel_format_info_size =
-    sizeof(pixel_format_info) / sizeof(pixel_format_info[0]);
+	sizeof(pixel_format_info) / sizeof(pixel_format_info[0]);
 
 const struct wlr_pixel_format_info *drm_get_pixel_format_info(uint32_t fmt) {
-  for (size_t i = 0; i < pixel_format_info_size; ++i) {
-    if (pixel_format_info[i].drm_format == fmt) {
-      return &pixel_format_info[i];
-    }
-  }
+	for (size_t i = 0; i < pixel_format_info_size; ++i) {
+		if (pixel_format_info[i].drm_format == fmt) {
+			return &pixel_format_info[i];
+		}
+	}
 
-  return NULL;
+	return NULL;
 }
 
 uint32_t convert_wl_shm_format_to_drm(enum wl_shm_format fmt) {
-  switch (fmt) {
-  case WL_SHM_FORMAT_XRGB8888:
-    return DRM_FORMAT_XRGB8888;
-  case WL_SHM_FORMAT_ARGB8888:
-    return DRM_FORMAT_ARGB8888;
-  default:
-    return (uint32_t)fmt;
-  }
+	switch (fmt) {
+	case WL_SHM_FORMAT_XRGB8888:
+		return DRM_FORMAT_XRGB8888;
+	case WL_SHM_FORMAT_ARGB8888:
+		return DRM_FORMAT_ARGB8888;
+	default:
+		return (uint32_t)fmt;
+	}
 }
 
 enum wl_shm_format convert_drm_format_to_wl_shm(uint32_t fmt) {
-  switch (fmt) {
-  case DRM_FORMAT_XRGB8888:
-    return WL_SHM_FORMAT_XRGB8888;
-  case DRM_FORMAT_ARGB8888:
-    return WL_SHM_FORMAT_ARGB8888;
-  default:
-    return (enum wl_shm_format)fmt;
-  }
+	switch (fmt) {
+	case DRM_FORMAT_XRGB8888:
+		return WL_SHM_FORMAT_XRGB8888;
+	case DRM_FORMAT_ARGB8888:
+		return WL_SHM_FORMAT_ARGB8888;
+	default:
+		return (enum wl_shm_format)fmt;
+	}
+}
+
+uint32_t pixel_format_info_pixels_per_block(const struct wlr_pixel_format_info *info) {
+	uint32_t pixels = info->block_width * info->block_height;
+	return pixels > 0 ? pixels : 1;
+}
+
+static int32_t div_round_up(int32_t dividend, int32_t divisor) {
+	int32_t quotient = dividend / divisor;
+	if (dividend % divisor != 0) {
+		quotient++;
+	}
+	return quotient;
+}
+
+int32_t pixel_format_info_min_stride(const struct wlr_pixel_format_info *fmt, int32_t width) {
+	int32_t pixels_per_block = (int32_t)pixel_format_info_pixels_per_block(fmt);
+	int32_t bytes_per_block = (int32_t)fmt->bytes_per_block;
+	if (width > INT32_MAX / bytes_per_block) {
+		wlr_log(WLR_DEBUG, "Invalid width %d (overflow)", width);
+		return 0;
+	}
+	return div_round_up(width * bytes_per_block, pixels_per_block);
+}
+
+bool pixel_format_info_check_stride(const struct wlr_pixel_format_info *fmt,
+		int32_t stride, int32_t width) {
+	int32_t bytes_per_block = (int32_t)fmt->bytes_per_block;
+	if (stride % bytes_per_block != 0) {
+		wlr_log(WLR_DEBUG, "Invalid stride %d (incompatible with %d "
+			"bytes-per-block)", stride, bytes_per_block);
+		return false;
+	}
+
+	int32_t min_stride = pixel_format_info_min_stride(fmt, width);
+	if (min_stride <= 0) {
+		return false;
+	} else if (stride < min_stride) {
+		wlr_log(WLR_DEBUG, "Invalid stride %d (too small for %d "
+			"bytes-per-block and width %d)", stride, bytes_per_block, width);
+		return false;
+	}
+
+	return true;
 }