gdk: Allow querying GL SRGB formats

Nobody is using this yet.
gdk: Allow querying Vulkan SRGB formats
2024-06-17 22:27:06 +02:00 · 2024-06-17 22:27:06 +02:00 · 2024-06-17 22:27:06 +02:00 · 2024-06-17 22:27:06 +02:00 · 2024-06-17 22:27:06 +02:00 · 2024-06-17 22:27:06 +02:00
13 changed files with 199 additions and 136 deletions
--- a/gdk/gdkdmabuffourccprivate.h
+++ b/gdk/gdkdmabuffourccprivate.h
@@ -10,6 +10,10 @@
 				 ((__u32)(c) << 16) | ((__u32)(d) << 24))
 #endif

+#ifndef DRM_FORMAT_INVALID
+#define DRM_FORMAT_INVALID	0
+#endif
+
 #ifndef DRM_FORMAT_C1
 #define DRM_FORMAT_C1		fourcc_code('C', '1', ' ', ' ')
 #endif
--- a/gdk/gdkgltexture.c
+++ b/gdk/gdkgltexture.c
@@ -151,7 +151,7 @@ gdk_gl_texture_find_format (GdkGLContext    *context,

  for (format = 0; format < GDK_MEMORY_N_FORMATS; format++)
    {
-      GLint q_internal_format;
+      GLint q_internal_format, q_internal_srgb_format;
      GLenum q_format, q_type;
      GLint q_swizzle[4];

@@ -164,6 +164,7 @@ gdk_gl_texture_find_format (GdkGLContext    *context,
      gdk_memory_format_gl_format (format,
                                   gdk_gl_context_get_use_es (context),
                                   &q_internal_format,
+                                   &q_internal_srgb_format,
                                   &q_format,
                                   &q_type,
                                   q_swizzle);
@@ -187,7 +188,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
  GdkMemoryFormat format;
  gsize expected_stride;
  Download *download = download_;
-  GLint gl_internal_format;
+  GLint gl_internal_format, gl_internal_srgb_format;
  GLenum gl_format, gl_type;
  GLint gl_swizzle[4];

@@ -199,7 +200,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
    {
      gdk_memory_format_gl_format (format,
                                   gdk_gl_context_get_use_es (context),
-                                   &gl_internal_format,
+                                   &gl_internal_format, &gl_internal_srgb_format,
                                   &gl_format, &gl_type, gl_swizzle);
      if (download->stride == expected_stride &&
          download->format == format)
@@ -262,7 +263,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,

              gdk_memory_format_gl_format (actual_format,
                                           gdk_gl_context_get_use_es (context),
-                                           &gl_internal_format,
+                                           &gl_internal_format, &gl_internal_srgb_format,
                                           &gl_read_format, &gl_read_type, gl_swizzle);
            }
        }
@@ -274,7 +275,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,

          gdk_memory_format_gl_format (actual_format,
                                       gdk_gl_context_get_use_es (context),
-                                       &gl_internal_format,
+                                       &gl_internal_format, &gl_internal_srgb_format,
                                       &gl_read_format, &gl_read_type, gl_swizzle);
        }

--- a/gdk/gdkmemoryformat.c
+++ b/gdk/gdkmemoryformat.c
@@ -338,7 +338,9 @@ struct _GdkMemoryFormatDescription
  struct {
    GLint internal_gl_format;
    GLint internal_gles_format;
+    GLint internal_srgb_format;
    GLenum format;
+    GLenum srgb_format;
    GLenum type;
    GLint swizzle[4];
    /* -1 if none exists, ie the format is already RGBA
@@ -348,6 +350,7 @@ struct _GdkMemoryFormatDescription
  } gl;
 #ifdef GDK_RENDERING_VULKAN
  VkFormat vk_format;
+  VkFormat vk_srgb_format;
 #endif
 #ifdef HAVE_DMABUF
  guint32 dmabuf_fourcc;
@@ -380,6 +383,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_BGRA,
+        .internal_srgb_format = -1,
        .format = GL_BGRA,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -388,6 +392,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_B8G8R8A8_UNORM,
+    .vk_srgb_format = VK_FORMAT_B8G8R8A8_SRGB,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_ARGB8888,
@@ -409,6 +414,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_RGBA8,
+        .internal_srgb_format = GL_SRGB8_ALPHA8,
        .format = GL_BGRA,
        .type = GDK_GL_UNSIGNED_BYTE_FLIPPED,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -417,6 +423,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_UNDEFINED,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_BGRA8888,
@@ -438,6 +445,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_RGBA8,
+        .internal_srgb_format = GL_SRGB8_ALPHA8,
        .format = GL_RGBA,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -445,6 +453,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R8G8B8A8_UNORM,
+    .vk_srgb_format = VK_FORMAT_R8G8B8A8_SRGB,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_ABGR8888,
@@ -466,6 +475,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_RGBA8,
+        .internal_srgb_format = GL_SRGB8_ALPHA8,
        .format = GL_RGBA,
        .type = GDK_GL_UNSIGNED_BYTE_FLIPPED,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -474,6 +484,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_UNDEFINED,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_RGBA8888,
@@ -495,6 +506,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_BGRA,
+        .internal_srgb_format = -1,
        .format = GL_BGRA,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -503,6 +515,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_B8G8R8A8_UNORM,
+    .vk_srgb_format = VK_FORMAT_B8G8R8A8_SRGB,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_ARGB8888,
@@ -524,6 +537,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_RGBA8,
+        .internal_srgb_format = GL_SRGB8_ALPHA8,
        .format = GL_BGRA,
        .type = GDK_GL_UNSIGNED_BYTE_FLIPPED,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -532,6 +546,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_UNDEFINED,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_BGRA8888,
@@ -553,6 +568,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_RGBA8,
+        .internal_srgb_format = GL_SRGB8_ALPHA8,
        .format = GL_RGBA,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -560,6 +576,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R8G8B8A8_UNORM,
+    .vk_srgb_format = VK_FORMAT_R8G8B8A8_SRGB,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_ABGR8888,
@@ -581,6 +598,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_RGBA8,
+        .internal_srgb_format = GL_SRGB8_ALPHA8,
        .format = GL_RGBA,
        .type = GDK_GL_UNSIGNED_BYTE_FLIPPED,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -589,6 +607,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_UNDEFINED,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_RGBA8888,
@@ -611,6 +630,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_BGRA,
+        .internal_srgb_format = -1,
        .format = GL_BGRA,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ONE },
@@ -619,6 +639,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_B8G8R8A8_UNORM,
+    .vk_srgb_format = VK_FORMAT_B8G8R8A8_SRGB,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_XRGB8888,
@@ -641,6 +662,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_RGBA8,
+        .internal_srgb_format = GL_SRGB8_ALPHA8,
        .format = GL_BGRA,
        .type = GDK_GL_UNSIGNED_BYTE_FLIPPED,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ONE },
@@ -649,6 +671,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_UNDEFINED,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_BGRX8888,
@@ -671,6 +694,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_RGBA8,
+        .internal_srgb_format = GL_SRGB8_ALPHA8,
        .format = GL_RGBA,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ONE },
@@ -678,6 +702,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R8G8B8A8_UNORM,
+    .vk_srgb_format = VK_FORMAT_R8G8B8A8_SRGB,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_XBGR8888,
@@ -700,6 +725,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA8,
        .internal_gles_format = GL_RGBA8,
+        .internal_srgb_format = GL_SRGB8_ALPHA8,
        .format = GL_RGBA,
        .type = GDK_GL_UNSIGNED_BYTE_FLIPPED,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ONE },
@@ -708,6 +734,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_UNDEFINED,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_RGBX8888,
@@ -730,6 +757,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGB8,
        .internal_gles_format = GL_RGB8,
+        .internal_srgb_format = GL_SRGB8,
        .format = GL_RGB,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -737,6 +765,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R8G8B8_UNORM,
+    .vk_srgb_format = VK_FORMAT_R8G8B8_SRGB,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_BGR888,
@@ -759,6 +788,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGB8,
        .internal_gles_format = GL_RGB8,
+        .internal_srgb_format = GL_SRGB8,
        .format = GL_BGR,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -767,6 +797,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_B8G8R8_UNORM,
+    .vk_srgb_format = VK_FORMAT_B8G8R8_SRGB,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_RGB888,
@@ -792,6 +823,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGB16,
        .internal_gles_format = GL_RGB16,
+        .internal_srgb_format = -1,
        .format = GL_RGB,
        .type = GL_UNSIGNED_SHORT,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -799,6 +831,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16G16B16_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -823,6 +856,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA16,
        .internal_gles_format = GL_RGBA16,
+        .internal_srgb_format = -1,
        .format = GL_RGBA,
        .type = GL_UNSIGNED_SHORT,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -830,6 +864,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16G16B16A16_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_ABGR16161616,
@@ -854,6 +889,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA16,
        .internal_gles_format = GL_RGBA16,
+        .internal_srgb_format = -1,
        .format = GL_RGBA,
        .type = GL_UNSIGNED_SHORT,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -861,6 +897,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16G16B16A16_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_ABGR16161616,
@@ -885,6 +922,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGB16F,
        .internal_gles_format = GL_RGB16F,
+        .internal_srgb_format = -1,
        .format = GL_RGB,
        .type = GL_HALF_FLOAT,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -892,6 +930,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16G16B16_SFLOAT,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -915,6 +954,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA16F,
        .internal_gles_format = GL_RGBA16F,
+        .internal_srgb_format = -1,
        .format = GL_RGBA,
        .type = GL_HALF_FLOAT,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -922,6 +962,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16G16B16A16_SFLOAT,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_ABGR16161616F,
@@ -945,6 +986,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA16F,
        .internal_gles_format = GL_RGBA16F,
+        .internal_srgb_format = -1,
        .format = GL_RGBA,
        .type = GL_HALF_FLOAT,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -952,6 +994,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16G16B16A16_SFLOAT,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_ABGR16161616F,
@@ -976,6 +1019,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGB32F,
        .internal_gles_format = GL_RGB32F,
+        .internal_srgb_format = -1,
        .format = GL_RGB,
        .type = GL_FLOAT,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -983,6 +1027,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R32G32B32_SFLOAT,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1006,6 +1051,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA32F,
        .internal_gles_format = GL_RGBA32F,
+        .internal_srgb_format = -1,
        .format = GL_RGBA,
        .type = GL_FLOAT,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -1013,6 +1059,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R32G32B32A32_SFLOAT,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1036,6 +1083,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RGBA32F,
        .internal_gles_format = GL_RGBA32F,
+        .internal_srgb_format = -1,
        .format = GL_RGBA,
        .type = GL_FLOAT,
        .swizzle = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA },
@@ -1043,6 +1091,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R32G32B32A32_SFLOAT,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1065,6 +1114,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RG8,
        .internal_gles_format = GL_RG8,
+        .internal_srgb_format = -1,
        .format = GL_RG,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_GREEN },
@@ -1072,6 +1122,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R8G8_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1094,6 +1145,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RG8,
        .internal_gles_format = GL_RG8,
+        .internal_srgb_format = -1,
        .format = GL_RG,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_GREEN },
@@ -1101,6 +1153,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R8G8_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1123,6 +1176,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_R8,
        .internal_gles_format = GL_R8,
+        .internal_srgb_format = -1,
        .format = GL_RED,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_ONE },
@@ -1130,6 +1184,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R8_UNORM,
+    .vk_srgb_format = VK_FORMAT_R8_SRGB,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_R8,
@@ -1155,6 +1210,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RG16,
        .internal_gles_format = GL_RG16,
+        .internal_srgb_format = -1,
        .format = GL_RG,
        .type = GL_UNSIGNED_SHORT,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_GREEN },
@@ -1162,6 +1218,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16G16_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1187,6 +1244,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_RG16,
        .internal_gles_format = GL_RG16,
+        .internal_srgb_format = -1,
        .format = GL_RG,
        .type = GL_UNSIGNED_SHORT,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_GREEN },
@@ -1194,6 +1252,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16G16_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1219,6 +1278,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_R16,
        .internal_gles_format = GL_R16,
+        .internal_srgb_format = -1,
        .format = GL_RED,
        .type = GL_UNSIGNED_SHORT,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_ONE },
@@ -1226,6 +1286,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = DRM_FORMAT_R16,
@@ -1248,6 +1309,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_R8,
        .internal_gles_format = GL_R8,
+        .internal_srgb_format = -1,
        .format = GL_RED,
        .type = GL_UNSIGNED_BYTE,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_RED },
@@ -1255,6 +1317,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R8_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1280,6 +1343,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_R16,
        .internal_gles_format = GL_R16,
+        .internal_srgb_format = -1,
        .format = GL_RED,
        .type = GL_UNSIGNED_SHORT,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_RED },
@@ -1287,6 +1351,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16_UNORM,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1311,6 +1376,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_R16F,
        .internal_gles_format = GL_R16F,
+        .internal_srgb_format = -1,
        .format = GL_RED,
        .type = GL_HALF_FLOAT,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_RED },
@@ -1318,6 +1384,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R16_SFLOAT,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1342,6 +1409,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    .gl = {
        .internal_gl_format = GL_R32F,
        .internal_gles_format = GL_R32F,
+        .internal_srgb_format = -1,
        .format = GL_RED,
        .type = GL_FLOAT,
        .swizzle = { GL_RED, GL_RED, GL_RED, GL_RED },
@@ -1349,6 +1417,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
    },
 #ifdef GDK_RENDERING_VULKAN
    .vk_format = VK_FORMAT_R32_SFLOAT,
+    .vk_srgb_format = VK_FORMAT_UNDEFINED,
 #endif
 #ifdef HAVE_DMABUF
    .dmabuf_fourcc = 0,
@@ -1543,6 +1612,7 @@ void
 gdk_memory_format_gl_format (GdkMemoryFormat  format,
                             gboolean         gles,
                             GLint           *out_internal_format,
+                             GLint           *out_internal_srgb_format,
                             GLenum          *out_format,
                             GLenum          *out_type,
                             GLint            out_swizzle[4])
@@ -1551,6 +1621,7 @@ gdk_memory_format_gl_format (GdkMemoryFormat  format,
    *out_internal_format = memory_formats[format].gl.internal_gles_format;
  else
    *out_internal_format = memory_formats[format].gl.internal_gl_format;
+  *out_internal_srgb_format = memory_formats[format].gl.internal_srgb_format;
  *out_format = memory_formats[format].gl.format;
  *out_type = memory_formats[format].gl.type;
  memcpy (out_swizzle, memory_formats[format].gl.swizzle, sizeof(GLint) * 4);
@@ -1562,6 +1633,8 @@ gdk_memory_format_gl_format (GdkMemoryFormat  format,
 * @gles: TRUE for GLES, FALSE for GL
 * @out_actual_format: The actual RGBA format
 * @out_internal_format: the GL internal format
+ * @out_internal_srgb_format: the GL internal format to use for automatic
+ *   sRGB<=>linear conversion
 * @out_format: the GL format
 * @out_type: the GL type
 * @out_swizzle: The swizzle to use 
@@ -1580,6 +1653,7 @@ gdk_memory_format_gl_rgba_format (GdkMemoryFormat  format,
                                  gboolean         gles,
                                  GdkMemoryFormat *out_actual_format,
                                  GLint           *out_internal_format,
+                                  GLint           *out_internal_srgb_format,
                                  GLenum          *out_format,
                                  GLenum          *out_type,
                                  GLint            out_swizzle[4])
@@ -1594,6 +1668,7 @@ gdk_memory_format_gl_rgba_format (GdkMemoryFormat  format,
    *out_internal_format = memory_formats[actual].gl.internal_gles_format;
  else
    *out_internal_format = memory_formats[actual].gl.internal_gl_format;
+  *out_internal_srgb_format = memory_formats[actual].gl.internal_srgb_format;
  *out_format = memory_formats[actual].gl.format;
  *out_type = memory_formats[actual].gl.type;
  memcpy (out_swizzle, memory_formats[format].gl.rgba_swizzle, sizeof(GLint) * 4);
@@ -1647,6 +1722,14 @@ gdk_memory_format_vk_format (GdkMemoryFormat     format,
  return memory_formats[format].vk_format;
 }

+/* Gets the matching SRGB version of a VkFormat
+ * Returns VK_FORMAT_UNDEFINED if none exists */
+VkFormat
+gdk_memory_format_vk_srgb_format (GdkMemoryFormat format)
+{
+  return memory_formats[format].vk_srgb_format;
+}
+
 /* Vulkan version of gdk_memory_format_gl_rgba_format()
 * Returns VK_FORMAT_UNDEFINED on failure */
 VkFormat
--- a/gdk/gdkmemoryformatprivate.h
+++ b/gdk/gdkmemoryformatprivate.h
@@ -57,6 +57,7 @@ GdkMemoryFormat         gdk_memory_depth_get_alpha_format   (GdkMemoryDepth
 void                    gdk_memory_format_gl_format         (GdkMemoryFormat             format,
                                                             gboolean                    gles,
                                                             GLint                      *out_internal_format,
+                                                             GLint                      *out_internal_srgb_format,
                                                             GLenum                     *out_format,
                                                             GLenum                     *out_type,
                                                             GLint                       out_swizzle[4]);
@@ -64,12 +65,14 @@ gboolean                gdk_memory_format_gl_rgba_format    (GdkMemoryFormat
                                                             gboolean                    gles,
                                                             GdkMemoryFormat            *out_actual_format,
                                                             GLint                      *out_internal_format,
+                                                             GLint                      *out_internal_srgb_format,
                                                             GLenum                     *out_format,
                                                             GLenum                     *out_type,
                                                             GLint                       out_swizzle[4]);
 #ifdef GDK_RENDERING_VULKAN
 VkFormat                gdk_memory_format_vk_format         (GdkMemoryFormat             format,
                                                             VkComponentMapping         *out_swizzle);
+VkFormat                gdk_memory_format_vk_srgb_format    (GdkMemoryFormat             format);
 VkFormat                gdk_memory_format_vk_rgba_format    (GdkMemoryFormat             format,
                                                             GdkMemoryFormat            *out_rgba_format,
                                                             VkComponentMapping         *out_swizzle);
--- a/gsk/gl/gskglcommandqueue.c
+++ b/gsk/gl/gskglcommandqueue.c
@@ -1483,6 +1483,7 @@ memory_format_gl_format (GskGLCommandQueue *self,
                         gboolean           ensure_mipmap,
                         gboolean          *out_can_mipmap,
                         GLint             *gl_internalformat,
+                         GLint             *gl_internalsrgbformat,
                         GLenum            *gl_format,
                         GLenum            *gl_type,
                         GLint              gl_swizzle[4])
@@ -1507,6 +1508,7 @@ memory_format_gl_format (GskGLCommandQueue *self,
      gdk_memory_format_gl_format (data_format,
                                   gdk_gl_context_get_use_es (self->context),
                                   gl_internalformat,
+                                   gl_internalsrgbformat,
                                   gl_format,
                                   gl_type,
                                   gl_swizzle);
@@ -1519,6 +1521,7 @@ memory_format_gl_format (GskGLCommandQueue *self,
                                        gdk_gl_context_get_use_es (self->context),
                                        &alt_format,
                                        gl_internalformat,
+                                        gl_internalsrgbformat,
                                        gl_format,
                                        gl_type,
                                        gl_swizzle))
@@ -1534,6 +1537,7 @@ memory_format_gl_format (GskGLCommandQueue *self,
          gdk_memory_format_gl_format (alt_format,
                                       gdk_gl_context_get_use_es (self->context),
                                       gl_internalformat,
+                                       gl_internalsrgbformat,
                                       gl_format,
                                       gl_type,
                                       gl_swizzle);
@@ -1552,6 +1556,7 @@ memory_format_gl_format (GskGLCommandQueue *self,
          gdk_memory_format_gl_format (fallbacks[i],
                                       gdk_gl_context_get_use_es (self->context),
                                       gl_internalformat,
+                                       gl_internalsrgbformat,
                                       gl_format,
                                       gl_type,
                                       gl_swizzle);
@@ -1670,7 +1675,7 @@ gsk_gl_command_queue_upload_texture_chunks (GskGLCommandQueue    *self,
  G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
  int width, height;
  GdkMemoryFormat data_format;
-  GLint gl_internalformat;
+  GLint gl_internalformat, gl_internalsrgbformat;
  GLenum gl_format;
  GLenum gl_type;
  GLint gl_swizzle[4];
@@ -1713,6 +1718,7 @@ gsk_gl_command_queue_upload_texture_chunks (GskGLCommandQueue    *self,
                                         ensure_mipmap,
                                         out_can_mipmap,
                                         &gl_internalformat,
+                                         &gl_internalsrgbformat,
                                         &gl_format,
                                         &gl_type,
                                         gl_swizzle);
--- a/gsk/gpu/gskgldevice.c
+++ b/gsk/gpu/gskgldevice.c
@@ -635,6 +635,7 @@ gsk_gl_device_find_gl_format (GskGLDevice      *self,
                              GdkMemoryFormat  *out_format,
                              GskGpuImageFlags *out_flags,
                              GLint            *out_gl_internal_format,
+                              GLint            *out_gl_internal_srgb_format,
                              GLenum           *out_gl_format,
                              GLenum           *out_gl_type,
                              GLint             out_swizzle[4])
@@ -654,6 +655,7 @@ gsk_gl_device_find_gl_format (GskGLDevice      *self,
      gdk_memory_format_gl_format (format,
                                   gdk_gl_context_get_use_es (context),
                                   out_gl_internal_format,
+                                   out_gl_internal_srgb_format,
                                   out_gl_format,
                                   out_gl_type,
                                   out_swizzle);
@@ -665,6 +667,7 @@ gsk_gl_device_find_gl_format (GskGLDevice      *self,
                                        gdk_gl_context_get_use_es (context),
                                        &alt_format,
                                        out_gl_internal_format,
+                                        out_gl_internal_srgb_format,
                                        out_gl_format,
                                        out_gl_type,
                                        out_swizzle) &&
@@ -688,6 +691,7 @@ gsk_gl_device_find_gl_format (GskGLDevice      *self,
          gdk_memory_format_gl_format (fallbacks[i],
                                       gdk_gl_context_get_use_es (context),
                                       out_gl_internal_format,
+                                       out_gl_internal_srgb_format,
                                       out_gl_format,
                                       out_gl_type,
                                       out_swizzle);
--- a/gsk/gpu/gskgldeviceprivate.h
+++ b/gsk/gpu/gskgldeviceprivate.h
@@ -26,6 +26,7 @@ void                    gsk_gl_device_find_gl_format                    (GskGLDe
                                                                         GdkMemoryFormat        *out_format,
                                                                         GskGpuImageFlags       *out_flags,
                                                                         GLint                  *out_gl_internal_format,
+                                                                         GLint                  *out_gl_internal_srgb_format,
                                                                         GLenum                 *out_gl_format,
                                                                         GLenum                 *out_gl_type,
                                                                         GLint                   out_swizzle[4]);
--- a/gsk/gpu/gskglimage.c
+++ b/gsk/gpu/gskglimage.c
@@ -78,6 +78,7 @@ gsk_gl_image_new_backbuffer (GskGLDevice    *device,
  GskGLImage *self;
  GskGpuImageFlags flags;
  GLint swizzle[4];
+  GLint gl_internal_format, gl_internal_srgb_format;

  self = g_object_new (GSK_TYPE_GL_IMAGE, NULL);

@@ -87,11 +88,14 @@ gsk_gl_image_new_backbuffer (GskGLDevice    *device,
                                0,
                                &format,
                                &flags,
-                                &self->gl_internal_format,
+                                &gl_internal_format,
+                                &gl_internal_srgb_format,
                                &self->gl_format,
                                &self->gl_type,
                                swizzle);
  
+  self->gl_internal_format = gl_internal_format;
+
  gsk_gpu_image_setup (GSK_GPU_IMAGE (self), flags, format, width, height);

  /* texture_id == 0 means backbuffer */
@@ -116,6 +120,7 @@ gsk_gl_image_new (GskGLDevice      *device,
  GskGLImage *self;
  GLint swizzle[4];
  GskGpuImageFlags flags;
+  GLint gl_internal_format, gl_internal_srgb_format;
  gsize max_size;

  max_size = gsk_gpu_device_get_max_image_size (GSK_GPU_DEVICE (device));
@@ -129,11 +134,14 @@ gsk_gl_image_new (GskGLDevice      *device,
                                required_flags,
                                &format,
                                &flags,
-                                &self->gl_internal_format,
+                                &gl_internal_format,
+                                &gl_internal_srgb_format,
                                &self->gl_format,
                                &self->gl_type,
                                swizzle);
  
+  self->gl_internal_format = gl_internal_format;
+
  gsk_gpu_image_setup (GSK_GPU_IMAGE (self),
                       flags,
                       format,
@@ -177,6 +185,7 @@ gsk_gl_image_new_for_texture (GskGLDevice      *device,
  GdkMemoryFormat format, real_format;
  GskGpuImageFlags flags;
  GskGLImage *self;
+  GLint gl_internal_format, gl_internal_srgb_format;
  GLint swizzle[4];

  format = gdk_texture_get_format (owner);
@@ -188,10 +197,14 @@ gsk_gl_image_new_for_texture (GskGLDevice      *device,
                                0,
                                &real_format,
                                &flags,
-                                &self->gl_internal_format,
+                                &gl_internal_format,
+                                &gl_internal_srgb_format,
                                &self->gl_format,
                                &self->gl_type,
                                swizzle);
+  
+  self->gl_internal_format = gl_internal_format;
+
  if (format != real_format)
    flags = GSK_GPU_IMAGE_NO_BLIT | 
            (gdk_memory_format_alpha (format) == GDK_MEMORY_ALPHA_STRAIGHT ? GSK_GPU_IMAGE_STRAIGHT_ALPHA : 0);
--- a/gsk/gpu/gskgpunodeprocessor.c
+++ b/gsk/gpu/gskgpunodeprocessor.c
@@ -317,20 +317,18 @@ rect_round_to_pixels (const graphene_rect_t  *src,
                      const graphene_point_t *pixel_offset,
                      graphene_rect_t        *dest)
 {
-  float x, y, xscale, yscale, inv_xscale, inv_yscale;
+  float x, y, xscale, yscale;

  xscale = graphene_vec2_get_x (pixel_scale);
  yscale = graphene_vec2_get_y (pixel_scale);
-  inv_xscale = 1.0f / xscale;
-  inv_yscale = 1.0f / yscale;

  x = floorf ((src->origin.x + pixel_offset->x) * xscale);
  y = floorf ((src->origin.y + pixel_offset->y) * yscale);
  *dest = GRAPHENE_RECT_INIT (
-      x * inv_xscale - pixel_offset->x,
-      y * inv_yscale - pixel_offset->y,
-      (ceilf ((src->origin.x + pixel_offset->x + src->size.width) * xscale) - x) * inv_xscale,
-      (ceilf ((src->origin.y + pixel_offset->y + src->size.height) * yscale) - y) * inv_yscale);
+      x / xscale - pixel_offset->x,
+      y / yscale - pixel_offset->y,
+      (ceilf ((src->origin.x + pixel_offset->x + src->size.width) * xscale) - x) / xscale,
+      (ceilf ((src->origin.y + pixel_offset->y + src->size.height) * yscale) - y) / yscale);
 }

 static GskGpuImage *
@@ -1720,20 +1718,18 @@ gsk_gpu_node_processor_create_transform_pattern (GskGpuPatternWriter *self,

    case GSK_TRANSFORM_CATEGORY_2D_AFFINE:
      {
-        float sx, sy, dx, dy, inv_sx, inv_sy;
+        float sx, sy, dx, dy;
        graphene_vec4_t vec4;
        if (!gsk_gpu_pattern_writer_push_stack (self))
          return FALSE;
        gsk_transform_to_affine (transform, &sx, &sy, &dx, &dy);
-        inv_sx = 1.f / sx;
-        inv_sy = 1.f / sy;
        gsk_gpu_pattern_writer_append_uint (self, GSK_GPU_PATTERN_AFFINE);
-        graphene_vec4_init (&vec4, self->offset.x + dx, self->offset.y + dy, inv_sx, inv_sy);
+        graphene_vec4_init (&vec4, self->offset.x + dx, self->offset.y + dy, 1.f / sx, 1.f / sy);
        gsk_gpu_pattern_writer_append_vec4 (self, &vec4);
-        self->bounds.origin.x = (self->bounds.origin.x - self->offset.x - dx) * inv_sx;
-        self->bounds.origin.y = (self->bounds.origin.y - self->offset.y - dy) * inv_sy;
-        self->bounds.size.width *= inv_sx;
-        self->bounds.size.height *= inv_sy;
+        self->bounds.origin.x = (self->bounds.origin.x - self->offset.x - dx) / sx;
+        self->bounds.origin.y = (self->bounds.origin.y - self->offset.y - dy) / sy;
+        self->bounds.size.width /= sx;
+        self->bounds.size.height /= sy;
        self->offset = GRAPHENE_POINT_INIT (0, 0);
        graphene_vec2_init (&self->scale, fabs (sx), fabs (sy));
        graphene_vec2_multiply (&self->scale, &old_scale, &self->scale);
@@ -3000,7 +2996,7 @@ gsk_gpu_node_processor_add_glyph_node (GskGpuNodeProcessor *self,
  PangoFont *font;
  graphene_point_t offset;
  guint i, num_glyphs;
-  float scale, inv_scale;
+  float scale;
  GdkRGBA color;
  float align_scale_x, align_scale_y;
  float inv_align_scale_x, inv_align_scale_y;
@@ -3028,7 +3024,6 @@ gsk_gpu_node_processor_add_glyph_node (GskGpuNodeProcessor *self,
  offset.y += self->offset.y;

  scale = MAX (graphene_vec2_get_x (&self->scale), graphene_vec2_get_y (&self->scale));
-  inv_scale = 1.f / scale;

  if (gsk_font_get_hint_style (font) != CAIRO_HINT_STYLE_NONE)
    {
@@ -3072,16 +3067,16 @@ gsk_gpu_node_processor_add_glyph_node (GskGpuNodeProcessor *self,
                                                 &glyph_bounds,
                                                 &glyph_offset);

-      glyph_tex_rect = GRAPHENE_RECT_INIT (-glyph_bounds.origin.x * inv_scale,
-                                           -glyph_bounds.origin.y * inv_scale,
-                                           gsk_gpu_image_get_width (image) * inv_scale,
-                                           gsk_gpu_image_get_height (image) * inv_scale);
+      glyph_tex_rect = GRAPHENE_RECT_INIT (-glyph_bounds.origin.x / scale,
+                                           -glyph_bounds.origin.y / scale,
+                                           gsk_gpu_image_get_width (image) / scale,
+                                           gsk_gpu_image_get_height (image) / scale);
      glyph_bounds = GRAPHENE_RECT_INIT (0,
                                         0,
-                                         glyph_bounds.size.width * inv_scale,
-                                         glyph_bounds.size.height * inv_scale);
-      glyph_origin = GRAPHENE_POINT_INIT (glyph_origin.x - glyph_offset.x * inv_scale,
-                                          glyph_origin.y - glyph_offset.y * inv_scale);
+                                         glyph_bounds.size.width / scale,
+                                         glyph_bounds.size.height / scale);
+      glyph_origin = GRAPHENE_POINT_INIT (glyph_origin.x - glyph_offset.x / scale,
+                                          glyph_origin.y - glyph_offset.y / scale);

      if (image != last_image)
        {
@@ -3120,7 +3115,7 @@ gsk_gpu_node_processor_create_glyph_pattern (GskGpuPatternWriter *self,
  PangoFont *font;
  guint num_glyphs;
  gsize i;
-  float scale, inv_scale;
+  float scale;
  guint32 tex_id;
  GskGpuImage *last_image;
  graphene_point_t offset;
@@ -3141,7 +3136,6 @@ gsk_gpu_node_processor_create_glyph_pattern (GskGpuPatternWriter *self,
  offset.y += self->offset.y;

  scale = MAX (graphene_vec2_get_x (&self->scale), graphene_vec2_get_y (&self->scale));
-  inv_scale = 1.f / scale;

  gsk_gpu_pattern_writer_append_uint (self, GSK_GPU_PATTERN_GLYPHS);
  gsk_gpu_pattern_writer_append_rgba (self, gsk_text_node_get_color (node));
@@ -3196,24 +3190,24 @@ gsk_gpu_node_processor_create_glyph_pattern (GskGpuPatternWriter *self,
          last_image = image;
        }

-      glyph_origin = GRAPHENE_POINT_INIT (glyph_origin.x - glyph_offset.x * inv_scale,
-                                          glyph_origin.y - glyph_offset.y * inv_scale);
+      glyph_origin = GRAPHENE_POINT_INIT (glyph_origin.x - glyph_offset.x / scale,
+                                          glyph_origin.y - glyph_offset.y / scale);

      gsk_gpu_pattern_writer_append_uint (self, tex_id);
      gsk_gpu_pattern_writer_append_rect (self,
                                          &GRAPHENE_RECT_INIT (
                                              0,
                                              0,
-                                              glyph_bounds.size.width * inv_scale,
-                                              glyph_bounds.size.height * inv_scale
+                                              glyph_bounds.size.width / scale,
+                                              glyph_bounds.size.height / scale
                                          ),
                                          &glyph_origin);
      gsk_gpu_pattern_writer_append_rect (self,
                                          &GRAPHENE_RECT_INIT (
-                                              - glyph_bounds.origin.x * inv_scale,
-                                              - glyph_bounds.origin.y * inv_scale,
-                                              gsk_gpu_image_get_width (image) * inv_scale,
-                                              gsk_gpu_image_get_height (image) * inv_scale
+                                              - glyph_bounds.origin.x / scale,
+                                              - glyph_bounds.origin.y / scale,
+                                              gsk_gpu_image_get_width (image) / scale,
+                                              gsk_gpu_image_get_height (image) / scale
                                          ),
                                          &glyph_origin);

--- a/meson.build
+++ b/meson.build
@@ -26,6 +26,7 @@ cloudproviders_req = '>= 0.3.1'
 xkbcommon_req      = '>= 0.2.0'
 sysprof_req        = '>= 3.38.0'
 vulkan_req         = '>= 1.3'
+gstreamer_req      = '>= 1.24.0'

 fs = import('fs')
 gnome = import('gnome')
@@ -410,21 +411,27 @@ if win32_enabled
  pangowin32_dep = dependency('pangowin32')
 endif

-pangocairo_dep = dependency('pangocairo', version: pango_req)
-pixbuf_dep     = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
-                            default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false'])
-png_dep        = dependency('libpng', 'png')
-tiff_dep       = dependency('libtiff-4', 'tiff')
-jpeg_dep       = dependency('libjpeg', 'jpeg')
+pangocairo_dep    = dependency('pangocairo', version: pango_req)
+pixbuf_dep        = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
+                               default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false'])
+png_dep           = dependency('libpng', 'png')
+tiff_dep          = dependency('libtiff-4', 'tiff')
+jpeg_dep          = dependency('libjpeg', 'jpeg')

-epoxy_dep      = dependency('epoxy', version: epoxy_req)
-xkbdep         = dependency('xkbcommon', version: xkbcommon_req, required: wayland_enabled)
-graphene_dep   = dependency('graphene-gobject-1.0', version: graphene_req,
-                            default_options: ['tests=false', 'gobject_types=true'])
-iso_codes_dep  = dependency('iso-codes', required: false)
-gi_dep         = dependency('gobject-introspection-1.0', version: introspection_req,
-                            required: get_option('introspection').enabled() and
-                                      get_option('build-tests'))
+epoxy_dep         = dependency('epoxy', version: epoxy_req)
+xkbdep            = dependency('xkbcommon', version: xkbcommon_req, required: wayland_enabled)
+graphene_dep      = dependency('graphene-gobject-1.0', version: graphene_req,
+                               default_options: ['tests=false', 'gobject_types=true'])
+iso_codes_dep     = dependency('iso-codes', required: false)
+gi_dep            = dependency('gobject-introspection-1.0', version: introspection_req,
+                               required: get_option('introspection').enabled() and
+                                         get_option('build-tests'))
+gstplayer_dep     = dependency('gstreamer-player-1.0', version: gstreamer_req,
+                               required: get_option('media-gstreamer'))
+gstgl_dep         = dependency('gstreamer-gl-1.0', version: gstreamer_req,
+                               required: get_option('media-gstreamer'))
+gstallocators_dep = dependency('gstreamer-allocators-1.0', version: gstreamer_req,
+                               required: get_option('media-gstreamer'))

 fontconfig_dep = [] # only used in x11 backend

--- a/modules/media/gtkgstsink.c
+++ b/modules/media/gtkgstsink.c
@@ -52,10 +52,8 @@

 #include <gst/gl/gstglfuncs.h>

-#ifdef HAVE_GSTREAMER_DRM
 #include <gdk/gdkdmabuffourccprivate.h>
 #include <gst/allocators/gstdmabuf.h>
-#endif

 enum {
  PROP_0,
@@ -72,17 +70,11 @@ GST_DEBUG_CATEGORY (gtk_debug_gst_sink);

 #define NOGL_CAPS GST_VIDEO_CAPS_MAKE (FORMATS)

-#ifdef HAVE_GSTREAMER_DRM
-# define GST_VIDEO_DMA_DRM_CAPS_MAKE_STR GST_VIDEO_DMA_DRM_CAPS_MAKE "; "
-#else
-# define GST_VIDEO_DMA_DRM_CAPS_MAKE_STR
-#endif
-
 static GstStaticPadTemplate gtk_gst_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
    GST_PAD_SINK,
    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_DMA_DRM_CAPS_MAKE_STR
+    GST_STATIC_CAPS (GST_VIDEO_DMA_DRM_CAPS_MAKE "; "
                     "video/x-raw(" GST_CAPS_FEATURE_MEMORY_GL_MEMORY "), "
                     "format = (string) RGBA, "
                     "width = " GST_VIDEO_SIZE_RANGE ", "
@@ -130,7 +122,6 @@ gtk_gst_sink_get_times (GstBaseSink  *bsink,
    }
 }

-#ifdef HAVE_GSTREAMER_DRM
 static void
 add_drm_formats_and_modifiers (GstCaps          *caps,
                               GdkDmabufFormats *dmabuf_formats)
@@ -164,7 +155,6 @@ add_drm_formats_and_modifiers (GstCaps          *caps,
    gst_structure_take_value (gst_caps_get_structure (caps, 0), "drm-format",
        &dmabuf_list);
 }
-#endif

 static GstCaps *
 gtk_gst_sink_get_caps (GstBaseSink *bsink,
@@ -176,16 +166,12 @@ gtk_gst_sink_get_caps (GstBaseSink *bsink,

  if (self->gst_context)
    {
-      tmp = gst_pad_get_pad_template_caps (GST_BASE_SINK_PAD (bsink));
-#ifdef HAVE_GSTREAMER_DRM
-      {
-        GdkDisplay *display = gdk_gl_context_get_display (self->gdk_context);
-        GdkDmabufFormats *formats = gdk_display_get_dmabuf_formats (display);
+      GdkDisplay *display = gdk_gl_context_get_display (self->gdk_context);
+      GdkDmabufFormats *formats = gdk_display_get_dmabuf_formats (display);

-        tmp = gst_caps_make_writable (tmp);
-        add_drm_formats_and_modifiers (tmp, formats);
-      }
-#endif
+      tmp = gst_pad_get_pad_template_caps (GST_BASE_SINK_PAD (bsink));
+      tmp = gst_caps_make_writable (tmp);
+      add_drm_formats_and_modifiers (tmp, formats);
    }
  else
    {
@@ -218,24 +204,23 @@ gtk_gst_sink_set_caps (GstBaseSink *bsink,

  GST_DEBUG_OBJECT (self, "set caps with %" GST_PTR_FORMAT, caps);

-#ifdef HAVE_GSTREAMER_DRM
-  if (gst_video_is_dma_drm_caps (caps)) {
-    if (!gst_video_info_dma_drm_from_caps (&self->drm_info, caps))
-      return FALSE;
+  if (gst_video_is_dma_drm_caps (caps))
+    {
+      if (!gst_video_info_dma_drm_from_caps (&self->drm_info, caps))
+        return FALSE;

-    if (!gst_video_info_dma_drm_to_video_info (&self->drm_info, &self->v_info))
-      return FALSE;
+      if (!gst_video_info_dma_drm_to_video_info (&self->drm_info, &self->v_info))
+        return FALSE;

-    GST_INFO_OBJECT (self, "using DMABuf, passthrough possible");
-  } else {
-    gst_video_info_dma_drm_init (&self->drm_info);
-#endif
+      GST_INFO_OBJECT (self, "using DMABuf, passthrough possible");
+    }
+  else
+    {
+      gst_video_info_dma_drm_init (&self->drm_info);

-    if (!gst_video_info_from_caps (&self->v_info, caps))
-      return FALSE;
-#ifdef HAVE_GSTREAMER_DRM
-  }
-#endif
+      if (!gst_video_info_from_caps (&self->v_info, caps))
+        return FALSE;
+    }

  return TRUE;
 }
@@ -277,13 +262,11 @@ gtk_gst_sink_propose_allocation (GstBaseSink *bsink,
      return FALSE;
    }

-#ifdef HAVE_GSTREAMER_DRM
  if (gst_caps_features_contains (gst_caps_get_features (caps, 0), GST_CAPS_FEATURE_MEMORY_DMABUF))
    {
      gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0);
      return TRUE;
    }
-#endif

  if (!gst_caps_features_contains (gst_caps_get_features (caps, 0), GST_CAPS_FEATURE_MEMORY_GL_MEMORY))
    return FALSE;
@@ -376,7 +359,6 @@ gtk_gst_sink_texture_from_buffer (GtkGstSink      *self,
  viewport->size.width = GST_VIDEO_INFO_WIDTH (&self->v_info);
  viewport->size.height = GST_VIDEO_INFO_HEIGHT (&self->v_info);

-#ifdef HAVE_GSTREAMER_DRM
  if (gst_is_dmabuf_memory (gst_buffer_peek_memory (buffer, 0)))
    {
      g_autoptr (GdkDmabufTextureBuilder) builder = NULL;
@@ -433,10 +415,8 @@ gtk_gst_sink_texture_from_buffer (GtkGstSink      *self,
      *pixel_aspect_ratio = ((double) GST_VIDEO_INFO_PAR_N (&self->v_info) /
                             (double) GST_VIDEO_INFO_PAR_D (&self->v_info));
    }
-  else
-#endif
-  if (self->gdk_context &&
-      gst_video_frame_map (frame, &self->v_info, buffer, GST_MAP_READ | GST_MAP_GL))
+  else if (self->gdk_context &&
+           gst_video_frame_map (frame, &self->v_info, buffer, GST_MAP_READ | GST_MAP_GL))
    {
      GstGLSyncMeta *sync_meta;
      GdkGLTextureBuilder *builder;
@@ -649,20 +629,8 @@ gtk_gst_sink_initialize_gl (GtkGstSink *self)

          if (gl_api & (GST_GL_API_OPENGL3 | GST_GL_API_OPENGL))
            {
-#ifdef HAVE_GST_GL_DISPLAY_NEW_WITH_TYPE
              self->gst_display = gst_gl_display_new_with_type (GST_GL_DISPLAY_TYPE_WIN32);
-#else
-#if GST_GL_HAVE_PLATFORM_EGL
-              g_message ("If media fails to play, set the envvar `GST_DEBUG=1`, and if GstGL context creation fails");
-              g_message ("due to \"Couldn't create GL context: Cannot share context with non-EGL context\",");
-              g_message ("set in the environment `GST_GL_PLATFORM=wgl` and `GST_GL_WINDOW=win32`,");
-              g_message ("and restart the GTK application");
-#endif
-
-              self->gst_display = gst_gl_display_new ();
-#endif
            }
-
 #if GST_GL_HAVE_PLATFORM_EGL
          else
            {
--- a/modules/media/gtkgstsinkprivate.h
+++ b/modules/media/gtkgstsinkprivate.h
@@ -47,9 +47,7 @@ struct _GtkGstSink
  GstVideoSink         parent;

  GstVideoInfo         v_info;
-#ifdef HAVE_GSTREAMER_DRM
  GstVideoInfoDmaDrm   drm_info;
-#endif

  GtkGstPaintable *    paintable;
  GdkGLContext *       gdk_context;
--- a/modules/media/meson.build
+++ b/modules/media/meson.build
@@ -5,29 +5,10 @@ media_backends = []
 extra_c_args = ['-DGTK_COMPILATION']
 extra_c_args += common_cflags

-gstplayer_dep = dependency('gstreamer-player-1.0', version: '>= 1.12.3',
-                           required: get_option('media-gstreamer'))
-gstgl_dep = dependency('gstreamer-gl-1.0', version: '>= 1.12.3',
-                       required: get_option('media-gstreamer'))
-gstdrm_dep = dependency('gstreamer-allocators-1.0', version: '>= 1.23.1',
-                        required: false)
-
-if gstplayer_dep.found() and gstgl_dep.found()
-  extra_win_cflags = []
-
-  if host_machine.system() == 'windows' and gstgl_dep.version().version_compare('>=1.19.1')
-    message('libgstgl has gst_gl_display_new_with_type()')
-    extra_win_cflags += '-DHAVE_GST_GL_DISPLAY_NEW_WITH_TYPE'
-  endif
-
+if gstplayer_dep.found() and gstgl_dep.found() and gstallocators_dep.found()
  media_backends += 'gstreamer'
  cdata.set('HAVE_GSTREAMER', 1)
-  media_gst_deps = [ libm, libgtk_dep, gstplayer_dep, gstgl_dep ]
-
-  if libdrm_dep.found() and gstdrm_dep.found()
-    cdata.set('HAVE_GSTREAMER_DRM', 1)
-    media_gst_deps += [ gstdrm_dep ]
-  endif
+  media_gst_deps = [ libm, libgtk_dep, gstplayer_dep, gstgl_dep, gstallocators_dep ]

  shared_module('media-gstreamer',
    sources: [
@@ -35,7 +16,7 @@ if gstplayer_dep.found() and gstgl_dep.found()
      'gtkgstpaintable.c',
      'gtkgstsink.c',
    ],
-    c_args: extra_c_args + extra_win_cflags,
+    c_args: extra_c_args,
    dependencies: media_gst_deps,
    name_suffix: module_suffix,
    install_dir: media_install_dir,
Author	SHA1	Message	Date
Benjamin Otte	a05b95dcce	gdk: Allow querying GL SRGB formats Nobody is using this yet.	2024-06-17 22:27:06 +02:00
Benjamin Otte	117c74d9f2	gdk: Allow querying Vulkan SRGB formats Nobody is using this yet, this is just infrastructure.	2024-06-17 22:27:06 +02:00
Benjamin Otte	799ee297a8	gpu: Don't multiply by 1/x, divide by x This is less error-prone with floating point math, even though it is somewhat slower.	2024-06-17 22:27:06 +02:00
Benjamin Otte	7ff9c51016	build: bump GStreamer dep to 1.24.0 Depend on a release version, not a prerelease.	2024-06-17 22:27:06 +02:00
Benjamin Otte	aa7cbfbcfb	build: Remove an old workaround The workaround only triggered in GStreamer < 1.19.1 but we require 1.23 now.	2024-06-17 22:27:06 +02:00
Benjamin Otte	285c749c2c	build: Move GStreamer dependency checks Put them where all the other checks go so that it's easy for people reading build files to see what GTK depends on. Also reindent properly.	2024-06-17 22:27:06 +02:00
Benjamin Otte	0436e48353	gstreamer: Require the same version for all GStreamer deps We don't want people to have different GStramer library versions. GStreamer now is developed in a monorepo, so the versions are in sync.	2024-06-17 22:27:06 +02:00
Benjamin Otte	65336bc9c6	gstreamer: Always build dmabuf support I just spent an hour trying to figure out why things don't work. And it was an optional dependency hidden 3 layers deep in some meson file. This really has to stop. And because just like in GTK, GStreamer's dmabuf APIs are always available (they will just fail on Windows etc), there's no need to have any conditions. The only difference is that the GStreamer media backend now requires GStreamer 1.24.	2024-06-17 22:27:06 +02:00
Benjamin Otte	dfcd3df3fa	dmabuf: Add DRM_FORMAT_INVALID to our formats That's gonna be necessary for the next commit.	2024-06-17 22:27:06 +02:00