From: Benjamin Otte <otte@redhat.com>
Date: Sun, 17 Oct 2021 04:54:38 +0000 (+0200)
Subject: gltexture: Fix conditions for glGetTexImage() call
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~5^2~236^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c7e36bcf226643fc37b7de37cf9f00138b255384;p=gtk4.git

gltexture: Fix conditions for glGetTexImage() call

The conditions were inverted, plus we failed to limit this call to
non-GLES.
---

diff --git a/gdk/gdkgltexture.c b/gdk/gdkgltexture.c
index b20534801a..867fd538cd 100644
--- a/gdk/gdkgltexture.c
+++ b/gdk/gdkgltexture.c
@@ -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,