diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c index 825ed0ae8d..28bdd2ebc9 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -2042,15 +2042,6 @@ gdk_gl_context_has_sync (GdkGLContext *self) return priv->has_sync; } -/* Return if GL_BGRA works with glTexImage2D */ -gboolean -gdk_gl_context_has_bgra (GdkGLContext *self) -{ - GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self); - - return priv->has_bgra; -} - /* Return if glGenVertexArrays, glBindVertexArray and glDeleteVertexArrays * can be used */ diff --git a/gdk/gdkglcontextprivate.h b/gdk/gdkglcontextprivate.h index 7c8363c659..6b655eb366 100644 --- a/gdk/gdkglcontextprivate.h +++ b/gdk/gdkglcontextprivate.h @@ -171,8 +171,6 @@ gboolean gdk_gl_context_has_vertex_half_float (GdkGLContext gboolean gdk_gl_context_has_sync (GdkGLContext *self) G_GNUC_PURE; -gboolean gdk_gl_context_has_bgra (GdkGLContext *self) G_GNUC_PURE; - gboolean gdk_gl_context_has_vertex_arrays (GdkGLContext *self) G_GNUC_PURE; double gdk_gl_context_get_scale (GdkGLContext *self); diff --git a/gsk/gl/gskglglyphlibrary.c b/gsk/gl/gskglglyphlibrary.c index a13e9a8245..c060f01dad 100644 --- a/gsk/gl/gskglglyphlibrary.c +++ b/gsk/gl/gskglglyphlibrary.c @@ -119,11 +119,7 @@ gsk_gl_glyph_library_init_atlas (GskGLTextureLibrary *self, memset (pixel_data, 255, sizeof pixel_data); - if (!gdk_gl_context_has_bgra (gdk_gl_context_get_current ()) -#if G_BYTE_ORDER == G_BIG_ENDIAN - || gdk_gl_context_get_use_es (gdk_gl_context_get_current ()) -#endif - ) + if (gdk_gl_context_get_use_es (gdk_gl_context_get_current ())) { gl_format = GL_RGBA; gl_type = GL_UNSIGNED_BYTE; diff --git a/testsuite/gsk/compare/text-color-mix.node b/testsuite/gsk/compare/text-color-mix.node new file mode 100644 index 0000000000..a994278636 --- /dev/null +++ b/testsuite/gsk/compare/text-color-mix.node @@ -0,0 +1,21 @@ +text { + font: "text-mixed-color-colrv1 15" url("data:font/ttf;base64,AAEAAAAKAIAAAwAgQ09MUhc9T40AAAI4AAAAe0NQQUwB/wATAAACtAAAABpjbWFwAHUAPQAAATgA\ +AAA0Z2x5Zn7NhtgAAAF8AAAAkGhlYWQmof0NAAAArAAAADZoaGVhDAEEAgAAAOQAAAAkaG10eAQA\ +AAAAAAEoAAAAEGxvY2EAbACQAAABbAAAABBtYXhwAAkABQAAAQgAAAAgbmFtZR9CFpQAAAIMAAAA\ +KQABAAAAARmaAQnTZV8PPPUAAggAAAAAAOHCPQAAAAAA4cpZfQAAAAAEAAgAAAAAAQACAAAAAAAA\ +AAEAAAgAAAAAAAQAAAAAAAQAAAEAAAAAAAAAAAAAAAAAAAABAAEAAAAHAAQAAQAAAAAAAQAAAAAA\ +AAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAMAAQAKAAAAAYABAABAAIAIABG\ +//8AAAAgAEH////g/8AAAQAAAAAAAAAAAAAADAAYACQAMAA8AEgAAQAAAAAEAAgAAAMAADEhESEE\ +APwACAAAAQAAAAAEAAgAAAMAADEhESEEAPwACAAAAQAAAAAEAAgAAAMAADEhESEEAPwACAAAAQAA\ +AAAEAAgAAAMAADEhESEEAPwACAAAAQAAAAAEAAgAAAMAADEhESEEAPwACAAAAQAAAAAEAAgAAAMA\ +ADEhESEEAPwACAAAAAABABIAAQAAAAAAAQAXAAB0ZXh0LW1peGVkLWNvbG9yLWNvbHJ2MQAAAAAB\ +AAAAAAAAAAAAAAAAAAAAIgAAAEoAAAAAAAAAAAAAAAAAAAADAAQAAAAWAAUAAAAcAAYAAAAiAQEA\ +AAAAAQEAAAABAQEAAAACAAAAAwAAABAAAAAbAAAAJgoAAAYAAQIAAEAACgAABgACAgABQAAKAAAG\ +AAMCAAJAAAAAAAADAAEAAwAAAA4AAAAA//8A/wD//wAA/wAA\ +"); + glyphs: 1 20; +} +color { + bounds: 0 5 20 5; + color: rgb(255,0,0); +} diff --git a/testsuite/gsk/compare/text-color-mix.png b/testsuite/gsk/compare/text-color-mix.png new file mode 100644 index 0000000000..534048e577 Binary files /dev/null and b/testsuite/gsk/compare/text-color-mix.png differ diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build index 1517655c6f..a359986a47 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -136,6 +136,7 @@ compare_render_tests = [ 'stroke-fractional-translate-nogl', 'stroke-opacity', 'stroke-with-3d-contents-nogl-nocairo', + 'text-color-mix', 'text-glyph-lsb', 'text-mixed-color-nocairo', 'text-mixed-color-colrv1',