From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 24 Mar 2023 02:56:06 +0000 (-0400)
Subject: gltexture: Try harder to determine the format
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~510^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4291f27b562f58b4d86b4f1816047614f71e6085;p=gtk4.git

gltexture: Try harder to determine the format

We can query these things as long as the texture ID
is valid in the current context.
---

diff --git a/gdk/gdkgltexture.c b/gdk/gdkgltexture.c
index c0ff8100aa..85ea47b680 100644
--- a/gdk/gdkgltexture.c
+++ b/gdk/gdkgltexture.c
@@ -317,9 +317,9 @@ gdk_gl_texture_determine_format (GdkGLTexture *self)
   GLint internal_format;
 
   /* Abort if somebody else is GL-ing here... */
-  if (self->context != gdk_gl_context_get_current () ||
+  if (!gdk_gl_context_is_shared (self->context, gdk_gl_context_get_current ()) ||
       /* ... or glGetTexLevelParameter() isn't supported */
-      !gdk_gl_context_check_version (self->context, 0, 0, 3, 1))
+      !gdk_gl_context_check_version (gdk_gl_context_get_current (), 0, 0, 3, 1))
     {
       texture->format = GDK_MEMORY_DEFAULT;
       return;