Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I2963c1209316fb6755f572969f368970450d7991

1 files changed, 18 insertions, 0 deletions

diff --git a/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag b/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag
new file mode 100644
index 0000000000..0d0fa1cd3a
--- /dev/null
+++ b/src/quick/scenegraph/shaders_ng/8bittextmask_a.frag
@@ -0,0 +1,18 @@
+#version 440
+
+layout(location = 0) in vec2 sampleCoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D _qt_texture;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 matrix;
+    vec4 color;
+    vec2 textureScale;
+    float dpr;
+} ubuf;
+
+void main()
+{
+    fragColor = ubuf.color * texture(_qt_texture, sampleCoord).a; // take .a instead of .r
+}