From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 13 Sep 2023 20:56:47 +0000 (-0400)
Subject: gl renderer: Don't assume an atlas
X-Git-Tag: archive/raspbian/4.12.4+ds-3+rpi1^2~21^2~2^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ca02190e4754b4f0e440bdb853f24bcb5c4b91fb;p=gtk4.git

gl renderer: Don't assume an atlas

The source uniform may or may not point
to a glyph atlas. The optimization we do
for color nodes is only possible if it does,
so check this.

Fixes: #6094
---

diff --git a/gsk/gl/gskglrenderjob.c b/gsk/gl/gskglrenderjob.c
index 7baa9e5cb8..c862cb50a3 100644
--- a/gsk/gl/gskglrenderjob.c
+++ b/gsk/gl/gskglrenderjob.c
@@ -1462,7 +1462,8 @@ gsk_gl_render_job_visit_color_node (GskGLRenderJob      *job,
   batch = gsk_gl_command_queue_get_batch (job->command_queue);
 
   /* Limit the size, or we end up with a coordinate overflow somewhere. */
-  if (node->bounds.size.width < 300 &&
+  if (job->source_is_glyph_atlas &&
+      node->bounds.size.width < 300 &&
       node->bounds.size.height < 300 &&
       batch->any.kind == GSK_GL_COMMAND_KIND_DRAW &&
       batch->any.program == program->id)