[gtk/wip/otte/for-master: 2/2] texture: Remove gdk_texture_download_float()

[Benjamin Otte <otte src gnome org>]

commit d055ee27ed1642604d2687df3bcdc64ac4f93908
Author: Benjamin Otte <otte redhat com>
Date:   Sun Nov 28 08:03:07 2021 +0100

    texture: Remove gdk_texture_download_float()
    
    The download API is not well thought out yet, so postpone it until
    there's an actual usecase for it.
    
    Remove testcases, too.

 gdk/gdktexture.c                |  45 +------------
 testsuite/gdk/memorytexture.c   | 139 ----------------------------------------
 testsuite/gdk/texture-threads.c |   6 --
 3 files changed, 1 insertion(+), 189 deletions(-)
---
diff --git a/gdk/gdktexture.c b/gdk/gdktexture.c
index b9f35999a7..51663a7eec 100644
--- a/gdk/gdktexture.c
+++ b/gdk/gdktexture.c
@@ -28,8 +28,7 @@
  * `GdkPixbuf`, or a Cairo surface, or other pixel data.
  *
  * The ownership of the pixel data is transferred to the `GdkTexture`
- * instance; you can only make a copy of it, via [method@Gdk.Texture.download]
- * or [method@Gdk.Texture.download_float].
+ * instance; you can only make a copy of it, via [method@Gdk.Texture.download].
  *
  * `GdkTexture` is an immutable object: That means you cannot change
  * anything about it other than increasing the reference count via
@@ -743,48 +742,6 @@ gdk_texture_download (GdkTexture *texture,
                            stride);
 }
 
-/**
- * gdk_texture_download_float:
- * @texture: a `GdkTexture`
- * @data: (array): pointer to enough memory to be filled with the
- *   downloaded data of @texture
- * @stride: rowstride in elements, will usually be equal to
- *   gdk_texture_get_width() * 4
- *
- * Downloads the @texture into local memory in a high dynamic range format.
- *
- * This may be an expensive operation, as the actual texture data
- * may reside on a GPU or on a remote display server and because the data
- * may need to be upsampled if it was not already available in this
- * format.
- *
- * You may want to use [method@Gdk.Texture.download] instead if you don't
- * need high dynamic range support.
- *
- * The data format of the downloaded data is equivalent to
- * GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED, so every downloaded
- * pixel requires 16 bytes of memory.
- *
- * Note that the caller is responsible to provide sufficiently
- * aligned memory to access the resulting data directly as floats.
- *
- * Since: 4.6
- */
-void
-gdk_texture_download_float (GdkTexture *texture,
-                            float      *data,
-                            gsize       stride)
-{
-  g_return_if_fail (GDK_IS_TEXTURE (texture));
-  g_return_if_fail (data != NULL);
-  g_return_if_fail (stride >= gdk_texture_get_width (texture) * 4);
-
-  gdk_texture_do_download (texture,
-                           GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED,
-                           (guchar *) data,
-                           stride);
-}
-
 GdkMemoryFormat
 gdk_texture_get_format (GdkTexture *self)
 {
diff --git a/testsuite/gdk/memorytexture.c b/testsuite/gdk/memorytexture.c
index 712ff951cb..bbc563bab9 100644
--- a/testsuite/gdk/memorytexture.c
+++ b/testsuite/gdk/memorytexture.c
@@ -31,44 +31,6 @@ struct _TextureBuilder
   gsize offset;
 };
 
-static float
-gdk_memory_format_precsion (GdkMemoryFormat format)
-{
-  switch (format)
-    {
-    case GDK_MEMORY_R8G8B8:
-    case GDK_MEMORY_B8G8R8:
-    case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-    case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-    case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-    case GDK_MEMORY_B8G8R8A8:
-    case GDK_MEMORY_A8R8G8B8:
-    case GDK_MEMORY_R8G8B8A8:
-    case GDK_MEMORY_A8B8G8R8:
-      return 1/256.f;
-
-    case GDK_MEMORY_R16G16B16:
-    case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
-    case GDK_MEMORY_R16G16B16A16:
-      return 1/65536.f;
-
-    case GDK_MEMORY_R16G16B16_FLOAT:
-    case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
-    case GDK_MEMORY_R16G16B16A16_FLOAT:
-      return 0.0009765625f;
-
-    case GDK_MEMORY_R32G32B32_FLOAT:
-    case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
-    case GDK_MEMORY_R32G32B32A32_FLOAT:
-      return FLT_EPSILON;
-
-    case GDK_MEMORY_N_FORMATS:
-    default:
-      g_assert_not_reached ();
-      return 0;
-    }
-}
-
 static gsize
 gdk_memory_format_bytes_per_pixel (GdkMemoryFormat format)
 {
@@ -434,50 +396,6 @@ compare_textures (GdkTexture *expected,
   g_free (test_data);
 }
 
-static void
-compare_textures_float (GdkTexture *expected,
-                        GdkTexture *test,
-                        float       eps,
-                        gboolean    has_alpha)
-{
-  static int R = 0;
-  static int G = 1;
-  static int B = 2;
-  static int A = 3;
-  float *expected_data, *test_data;
-  int width, height;
-  int x, y;
-
-  g_assert_cmpint (gdk_texture_get_width (expected), ==, gdk_texture_get_width (test));
-  g_assert_cmpint (gdk_texture_get_height (expected), ==, gdk_texture_get_height (test));
-
-  width = gdk_texture_get_width (expected);
-  height = gdk_texture_get_height (expected);
-
-  expected_data = g_new (float, width * height * 4);
-  gdk_texture_download_float (expected, expected_data, width * 4);
-
-  test_data = g_new (float, width * height * 4);
-  gdk_texture_download_float (test, test_data, width * 4);
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          g_assert_cmpfloat_with_epsilon (expected_data[y * width + 4 * x + R], test_data[y * width + 4 * x 
+ R], eps);
-          g_assert_cmpfloat_with_epsilon (expected_data[y * width + 4 * x + G], test_data[y * width + 4 * x 
+ G], eps);
-          g_assert_cmpfloat_with_epsilon (expected_data[y * width + 4 * x + B], test_data[y * width + 4 * x 
+ B], eps);
-          if (has_alpha)
-            g_assert_cmpfloat_with_epsilon (expected_data[y * width + 4 * x + A], test_data[y * width + 4 * 
x + A], eps);
-          else
-            g_assert_cmpfloat (1.0, ==, test_data[y * width + 4 * x + A]);
-        }
-    }
-
-  g_free (expected_data);
-  g_free (test_data);
-}
-
 static GdkTexture *
 upload_to_gl (GdkTexture *texture)
 {
@@ -682,61 +600,6 @@ test_download_192x192 (gconstpointer data)
   g_object_unref (test);
 }
 
-static void
-test_download_float_1x1 (gconstpointer data)
-{
-  GdkMemoryFormat format;
-  TextureMethod method;
-  GdkTexture *expected, *test;
-  gsize i;
-
-  decode (data, &format, &method);
-
-  for (i = 0; i < N; i++)
-    {
-      GdkRGBA color;
-
-      create_random_color (&color);
-      expected = create_texture (GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED, TEXTURE_METHOD_LOCAL, 1, 1, 
&color);
-      test = create_texture (format, method, 1, 1, &color);
-      
-      compare_textures_float (expected, test,
-                              gdk_memory_format_precsion (format),
-                              gdk_memory_format_has_alpha (format));
-
-      g_object_unref (expected);
-      g_object_unref (test);
-    }
-}
-
-static void
-test_download_float_4x4 (gconstpointer data)
-{
-  GdkMemoryFormat format;
-  TextureMethod method;
-  GdkTexture *expected, *test;
-  gsize i;
-
-  decode (data, &format, &method);
-
-  for (i = 0; i < N; i++)
-    {
-      GdkRGBA color;
-
-      create_random_color (&color);
-      expected = create_texture (GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED, TEXTURE_METHOD_LOCAL, 4, 4, 
&color);
-      test = create_texture (format, method, 4, 4, &color);
-      
-      compare_textures_float (expected, test,
-                              gdk_memory_format_precsion (format),
-                              gdk_memory_format_has_alpha (format));
-
-      g_object_unref (expected);
-      g_object_unref (test);
-    }
-}
-
-
 static void
 add_test (const char    *name,
           GTestDataFunc  func)
@@ -772,8 +635,6 @@ main (int argc, char *argv[])
   add_test ("/memorytexture/download_1x1", test_download_1x1);
   add_test ("/memorytexture/download_4x4", test_download_4x4);
   add_test ("/memorytexture/download_192x192", test_download_192x192);
-  add_test ("/memorytexture/download_float_1x1", test_download_float_1x1);
-  add_test ("/memorytexture/download_float_4x4", test_download_float_4x4);
 
   gl_renderer = gsk_gl_renderer_new ();
   if (!gsk_renderer_realize (gl_renderer, NULL, NULL))
diff --git a/testsuite/gdk/texture-threads.c b/testsuite/gdk/texture-threads.c
index 17236070cf..753513faaf 100644
--- a/testsuite/gdk/texture-threads.c
+++ b/testsuite/gdk/texture-threads.c
@@ -9,7 +9,6 @@ ensure_texture_access (GdkTexture *texture)
 {
   /* Make sure to initialize the pixel to anything but red */
   guint32 pixel = 0;
-  float float_pixel[4] = { INFINITY, INFINITY, INFINITY, INFINITY };
 
   g_test_message ("Checking texture access in thread %p...", g_thread_self());
   /* Just to be sure */
@@ -18,14 +17,9 @@ ensure_texture_access (GdkTexture *texture)
 
   /* download the pixel */
   gdk_texture_download (texture, (guchar *) &pixel, 4);
-  gdk_texture_download_float (texture, float_pixel, 4);
 
   /* check the pixel is now red */
   g_assert_cmphex (pixel, ==, 0xFFFF0000);
-  g_assert_cmpfloat (float_pixel[0], ==, 1.0);
-  g_assert_cmpfloat (float_pixel[1], ==, 0.0);
-  g_assert_cmpfloat (float_pixel[2], ==, 0.0);
-  g_assert_cmpfloat (float_pixel[3], ==, 1.0);
 
   g_test_message ("...done in thread %p", g_thread_self());
 }