summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/shaders
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/painting/shaders')
-rw-r--r--src/gui/painting/shaders/backingstorecompose.frag8
-rw-r--r--src/gui/painting/shaders/backingstorecompose.frag.qsbbin1759 -> 1657 bytes
-rw-r--r--src/gui/painting/shaders/backingstorecompose.vert2
-rw-r--r--src/gui/painting/shaders/backingstorecompose.vert.qsbbin1627 -> 1408 bytes
4 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/painting/shaders/backingstorecompose.frag b/src/gui/painting/shaders/backingstorecompose.frag
index e0c419840e..3b08ade035 100644
--- a/src/gui/painting/shaders/backingstorecompose.frag
+++ b/src/gui/painting/shaders/backingstorecompose.frag
@@ -7,7 +7,7 @@ layout(std140, binding = 0) uniform buf {
mat4 vertexTransform;
mat3 textureTransform;
float opacity;
- int swapRedBlue;
+ int textureSwizzle;
};
layout(binding = 1) uniform sampler2D textureSampler;
@@ -16,8 +16,10 @@ void main()
{
vec4 tmpFragColor = texture(textureSampler, v_texcoord);
tmpFragColor.a *= opacity;
- if (swapRedBlue == 0)
+ if (textureSwizzle == 0)
fragColor = tmpFragColor;
+ else if(textureSwizzle == 2)
+ fragColor.argb = tmpFragColor;
else
- fragColor = tmpFragColor.bgra;
+ fragColor.bgra = tmpFragColor;
}
diff --git a/src/gui/painting/shaders/backingstorecompose.frag.qsb b/src/gui/painting/shaders/backingstorecompose.frag.qsb
index a7c2dfebce..63ba55eed8 100644
--- a/src/gui/painting/shaders/backingstorecompose.frag.qsb
+++ b/src/gui/painting/shaders/backingstorecompose.frag.qsb
Binary files differ
diff --git a/src/gui/painting/shaders/backingstorecompose.vert b/src/gui/painting/shaders/backingstorecompose.vert
index bb8444ade5..0c72c97419 100644
--- a/src/gui/painting/shaders/backingstorecompose.vert
+++ b/src/gui/painting/shaders/backingstorecompose.vert
@@ -9,7 +9,7 @@ layout(std140, binding = 0) uniform buf {
mat4 vertexTransform;
mat3 textureTransform;
float opacity;
- int swapRedBlue;
+ int textureSwizzle;
};
void main()
diff --git a/src/gui/painting/shaders/backingstorecompose.vert.qsb b/src/gui/painting/shaders/backingstorecompose.vert.qsb
index 1f464516fe..1aa6e661f8 100644
--- a/src/gui/painting/shaders/backingstorecompose.vert.qsb
+++ b/src/gui/painting/shaders/backingstorecompose.vert.qsb
Binary files differ