From: Christian Hergert <chergert@redhat.com>
Date: Tue, 15 Mar 2022 22:53:47 +0000 (-0700)
Subject: gsk/gl: ignore max_entry_size when zero
X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~4^2~301^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7062411bad6e04311d0486d747ebba58643986e3;p=gtk4.git

gsk/gl: ignore max_entry_size when zero

If the max_entry_size is zero, then assume we can add anything to the
atlas. This allows for situations where we might be uploading an arc list
to the atlas instead of pixel data for GPU font rendering.
---

diff --git a/gsk/gl/gskgltexturelibrary.c b/gsk/gl/gskgltexturelibrary.c
index 414190ea7d..fadec60a0c 100644
--- a/gsk/gl/gskgltexturelibrary.c
+++ b/gsk/gl/gskgltexturelibrary.c
@@ -381,7 +381,9 @@ gsk_gl_texture_library_pack (GskGLTextureLibrary *self,
       *out_packed_x = 0;
       *out_packed_y = 0;
     }
-  else if (width <= self->max_entry_size && height <= self->max_entry_size)
+  else if (self->max_entry_size == 0 ||
+           (width <= self->max_entry_size &&
+            height <= self->max_entry_size))
     {
       int packed_x;
       int packed_y;