gltexture: Fix conditions for glGetTexImage() call
authorBenjamin Otte <otte@redhat.com>
Sun, 17 Oct 2021 04:54:38 +0000 (06:54 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 17 Oct 2021 20:28:44 +0000 (22:28 +0200)
The conditions were inverted, plus we failed to limit this call to
non-GLES.

gdk/gdkgltexture.c

index b20534801a073b84891431841f9f6b3b39fab621..867fd538cd6f4d39e2f0321e65caf89c5367c0e8 100644 (file)
@@ -155,8 +155,9 @@ gdk_gl_texture_do_download (gpointer texture_,
 
   expected_stride = texture->width * gdk_memory_format_bytes_per_pixel (download->format);
 
-  if (download->stride != expected_stride &&
-      !gdk_memory_format_gl_format (download->format, gdk_gl_context_get_use_es (self->context), &gl_internal_format, &gl_format, &gl_type))
+  if (download->stride == expected_stride &&
+      !gdk_gl_context_get_use_es (self->context) && 
+      gdk_memory_format_gl_format (download->format, TRUE, &gl_internal_format, &gl_format, &gl_type))
     {
       glGetTexImage (GL_TEXTURE_2D,
                      0,