Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1

Change-Id: I886c4bda70a2b5a013a445d03487c7e3ef98e858

1 files changed, 12 insertions, 0 deletions

diff --git a/src/qtmultimediaquicktools/shaders/rgbvideo_swizzle_core.frag b/src/qtmultimediaquicktools/shaders/rgbvideo_swizzle_core.frag
new file mode 100644
index 000000000..e952124d1
--- /dev/null
+++ b/src/qtmultimediaquicktools/shaders/rgbvideo_swizzle_core.frag
@@ -0,0 +1,12 @@
+#version 150 core
+uniform sampler2D rgbTexture;
+uniform float opacity;
+uniform bool hasAlpha;
+in vec2 qt_TexCoord;
+out vec4 fragColor;
+
+void main()
+{
+    vec4 v = texture(rgbTexture, qt_TexCoord);
+    fragColor = vec4(v.bgr, hasAlpha ? v.a : 1.0) * opacity;
+}