diff options
Diffstat (limited to 'tests/manual/scenegraph_lancelot/data/shared')
53 files changed, 182 insertions, 385 deletions
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag Binary files differdeleted file mode 100644 index 15459ffdb9..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.frag Binary files differdeleted file mode 100644 index 277d07f7ae..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag Binary files differdeleted file mode 100644 index 5ef0333b6b..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag Binary files differdeleted file mode 100644 index 97a021fe3e..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.frag Binary files differdeleted file mode 100644 index 42a11de194..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag Binary files differdeleted file mode 100644 index aecaa621ef..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag Binary files differdeleted file mode 100644 index ef7a9c10ca..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag Binary files differdeleted file mode 100644 index ca58580786..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag Binary files differdeleted file mode 100644 index e1fc8b0ce8..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag Binary files differdeleted file mode 100644 index 2e0b809d7d..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag Binary files differdeleted file mode 100644 index 106c2c5515..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.frag Binary files differdeleted file mode 100644 index 56bcd200fe..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.frag Binary files differdeleted file mode 100644 index 078252cad4..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag Binary files differdeleted file mode 100644 index 788a047ab0..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag Binary files differdeleted file mode 100644 index e3907a90d2..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vert Binary files differdeleted file mode 100644 index 623df9a177..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vert +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert Binary files differdeleted file mode 100644 index 14cb4e768f..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert +++ /dev/null diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag index 6b3a881174..aa850af449 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag @@ -1,5 +1,8 @@ -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + void main() { - gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1); + fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag index e04a71d816..2fb1fbe91b 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag @@ -1,7 +1,10 @@ -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + void main() { lowp float u = qt_TexCoord0.x; lowp float v = qt_TexCoord0.y; - gl_FragColor = vec4(u*v, v*v, v, v); + fragColor = vec4(u*v, v*v, v, v); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag deleted file mode 100644 index 2fb1fbe91b..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag +++ /dev/null @@ -1,10 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -void main() { - lowp float u = qt_TexCoord0.x; - lowp float v = qt_TexCoord0.y; - fragColor = vec4(u*v, v*v, v, v); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag deleted file mode 100644 index aa850af449..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag +++ /dev/null @@ -1,8 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -void main() { - fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag index d63a0fa6ee..5d528e1d7a 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag @@ -1,14 +1,18 @@ -uniform lowp sampler2D cyan; -uniform lowp sampler2D magenta; -uniform lowp sampler2D yellow; -uniform lowp sampler2D black; -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D cyan; +layout(binding = 2) uniform sampler2D magenta; +layout(binding = 3) uniform sampler2D yellow; +layout(binding = 4) uniform sampler2D black; + void main() { - highp vec2 t = qt_TexCoord0 * 3. - 1.; - lowp float c = texture2D(cyan, t + vec2(.05, .09)).a; - lowp float m = texture2D(magenta, t + vec2(.04, -.10)).a; - lowp float y = texture2D(yellow, t + vec2(-.10, .01)).a; - lowp float k = texture2D(black, t).a; - gl_FragColor = 1. - vec4(c + k, m + k, y + k, 0.); + vec2 t = qt_TexCoord0 * 3. - 1.; + lowp float c = texture(cyan, t + vec2(.05, .09)).a; + lowp float m = texture(magenta, t + vec2(.04, -.10)).a; + lowp float y = texture(yellow, t + vec2(-.10, .01)).a; + lowp float k = texture(black, t).a; + fragColor = 1. - vec4(c + k, m + k, y + k, 0.); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag deleted file mode 100644 index 5d528e1d7a..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag +++ /dev/null @@ -1,18 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D cyan; -layout(binding = 2) uniform sampler2D magenta; -layout(binding = 3) uniform sampler2D yellow; -layout(binding = 4) uniform sampler2D black; - -void main() { - vec2 t = qt_TexCoord0 * 3. - 1.; - lowp float c = texture(cyan, t + vec2(.05, .09)).a; - lowp float m = texture(magenta, t + vec2(.04, -.10)).a; - lowp float y = texture(yellow, t + vec2(-.10, .01)).a; - lowp float k = texture(black, t).a; - fragColor = 1. - vec4(c + k, m + k, y + k, 0.); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat b/tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat deleted file mode 100644 index e13d1f074e..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat +++ /dev/null @@ -1,18 +0,0 @@ -qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/subrect.vert subrect_rhi.vert -qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/wave.vert wave_rhi.vert - -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/basic.frag basic_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/basic_alpha.frag basic_alpha_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/cmyk.frag cmyk_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/culling.frag culling_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/desaturate.frag desaturate_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/edge.frag edge_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient.frag gradient_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient2.frag gradient2_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient3.frag gradient3_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient4.frag gradient4_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient5.frag gradient5_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradientgrid.frag gradientgrid_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/property.frag property_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/shadow.frag shadow_rhi.frag -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/stencil.frag stencil_rhi.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag index 1b12df7c6d..cc3c9a0f14 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag @@ -1,9 +1,13 @@ -varying highp vec2 qt_TexCoord0; -uniform sampler2D frontSource; -uniform sampler2D backSource; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D frontSource; +layout(binding = 2) uniform sampler2D backSource; + void main() { - gl_FragColor = gl_FrontFacing - ? texture2D(frontSource, qt_TexCoord0) - : texture2D(backSource, qt_TexCoord0); + fragColor = gl_FrontFacing + ? texture(frontSource, qt_TexCoord0) + : texture(backSource, qt_TexCoord0); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag deleted file mode 100644 index cc3c9a0f14..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag +++ /dev/null @@ -1,13 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D frontSource; -layout(binding = 2) uniform sampler2D backSource; - -void main() { - fragColor = gl_FrontFacing - ? texture(frontSource, qt_TexCoord0) - : texture(backSource, qt_TexCoord0); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag index a38f3d1de2..a4299c6d68 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag @@ -1,9 +1,12 @@ -uniform lowp sampler2D source; -varying highp vec2 qt_TexCoord0; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; +layout(binding = 1) uniform sampler2D source; void main() { - lowp vec4 c = texture2D(source, qt_TexCoord0); + lowp vec4 c = texture(source, qt_TexCoord0); lowp float level = c.r * 0.3 + c.g * 0.59 + c.b * 0.11; - gl_FragColor = vec4(level, level, level, c.a); + fragColor = vec4(level, level, level, c.a); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag deleted file mode 100644 index a4299c6d68..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag +++ /dev/null @@ -1,12 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; -layout(binding = 1) uniform sampler2D source; - -void main() { - lowp vec4 c = texture(source, qt_TexCoord0); - lowp float level = c.r * 0.3 + c.g * 0.59 + c.b * 0.11; - - fragColor = vec4(level, level, level, c.a); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag index 8cb616f3e0..77d7b47499 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag @@ -1,14 +1,23 @@ -uniform lowp sampler2D source; -varying highp vec2 qt_TexCoord0; -uniform highp vec2 textureSize; -uniform lowp vec4 color; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; + vec2 textureSize; + vec4 color; +} ubuf; + void main() { - highp vec2 dx = vec2(0.5 / textureSize.x, 0.); - highp vec2 dy = vec2(0., 0.5 / textureSize.y); - gl_FragColor = color * 0.25 - * (texture2D(source, qt_TexCoord0 + dx + dy).a - + texture2D(source, qt_TexCoord0 + dx - dy).a - + texture2D(source, qt_TexCoord0 - dx + dy).a - + texture2D(source, qt_TexCoord0 - dx - dy).a); + vec2 dx = vec2(0.5 / ubuf.textureSize.x, 0.); + vec2 dy = vec2(0., 0.5 / ubuf.textureSize.y); + fragColor = ubuf.color * 0.25 + * (texture(source, qt_TexCoord0 + dx + dy).a + + texture(source, qt_TexCoord0 + dx - dy).a + + texture(source, qt_TexCoord0 - dx + dy).a + + texture(source, qt_TexCoord0 - dx - dy).a); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag deleted file mode 100644 index 77d7b47499..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag +++ /dev/null @@ -1,23 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D source; - -layout(std140, binding = 0) uniform buf { - mat4 qt_Matrix; - float qt_Opacity; - vec2 textureSize; - vec4 color; -} ubuf; - -void main() { - vec2 dx = vec2(0.5 / ubuf.textureSize.x, 0.); - vec2 dy = vec2(0., 0.5 / ubuf.textureSize.y); - fragColor = ubuf.color * 0.25 - * (texture(source, qt_TexCoord0 + dx + dy).a - + texture(source, qt_TexCoord0 + dx - dy).a - + texture(source, qt_TexCoord0 - dx + dy).a - + texture(source, qt_TexCoord0 - dx - dy).a); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag index c581cc0c73..84eee1dbfe 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag @@ -1,6 +1,10 @@ -uniform lowp sampler2D source; -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + void main() { - gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a; + fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a; } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag index 5f07e56d4a..b08e6339b3 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag @@ -1,6 +1,10 @@ -uniform lowp sampler2D source; -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + void main() { - gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 0, 1) + texture2D(source, qt_TexCoord0); + fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 0, 1) + texture(source, qt_TexCoord0); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag deleted file mode 100644 index b08e6339b3..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag +++ /dev/null @@ -1,10 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D source; - -void main() { - fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 0, 1) + texture(source, qt_TexCoord0); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag index 61c9d46f94..2e523c2879 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag @@ -1,6 +1,10 @@ -uniform lowp sampler2D source; -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + void main() { - gl_FragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a; + fragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a; } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag deleted file mode 100644 index 2e523c2879..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag +++ /dev/null @@ -1,10 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D source; - -void main() { - fragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a; -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag index 81d96ce126..a100ba2cd7 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag @@ -1,6 +1,10 @@ -uniform lowp sampler2D source; -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + void main() { - gl_FragColor = vec4(1, qt_TexCoord0.y, 0, 1) * texture2D(source, qt_TexCoord0).a; + fragColor = vec4(1, qt_TexCoord0.y, 0, 1) * texture(source, qt_TexCoord0).a; } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag deleted file mode 100644 index a100ba2cd7..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag +++ /dev/null @@ -1,10 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D source; - -void main() { - fragColor = vec4(1, qt_TexCoord0.y, 0, 1) * texture(source, qt_TexCoord0).a; -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag index 33485542af..4ec104bd14 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag @@ -1,6 +1,10 @@ -uniform lowp sampler2D source; -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + void main() { - gl_FragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture2D(source, qt_TexCoord0).a; + fragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture(source, qt_TexCoord0).a; } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag deleted file mode 100644 index 4ec104bd14..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag +++ /dev/null @@ -1,10 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D source; - -void main() { - fragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture(source, qt_TexCoord0).a; -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag deleted file mode 100644 index 84eee1dbfe..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag +++ /dev/null @@ -1,10 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D source; - -void main() { - fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a; -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag index 851f07c948..999629745b 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag @@ -1,9 +1,13 @@ -uniform lowp sampler2D source; -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + void main() { lowp float r = mod(qt_TexCoord0.x * 10.0, 1.0); lowp float g = mod(qt_TexCoord0.y * 10.0, 1.0); lowp float b = qt_TexCoord0.x; - gl_FragColor = vec4(r, g, b, 1) * texture2D(source, qt_TexCoord0).a; + fragColor = vec4(r, g, b, 1) * texture(source, qt_TexCoord0).a; } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag deleted file mode 100644 index 999629745b..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag +++ /dev/null @@ -1,13 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D source; - -void main() { - lowp float r = mod(qt_TexCoord0.x * 10.0, 1.0); - lowp float g = mod(qt_TexCoord0.y * 10.0, 1.0); - lowp float b = qt_TexCoord0.x; - fragColor = vec4(r, g, b, 1) * texture(source, qt_TexCoord0).a; -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag index 0d28bff43b..2ffa707fb1 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag @@ -1,6 +1,14 @@ -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; -uniform lowp float colorProperty; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; + float colorProperty; +} ubuf; + void main() { - gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, colorProperty, 1); + fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, ubuf.colorProperty, 1); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag deleted file mode 100644 index 2ffa707fb1..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag +++ /dev/null @@ -1,14 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(std140, binding = 0) uniform buf { - mat4 qt_Matrix; - float qt_Opacity; - float colorProperty; -} ubuf; - -void main() { - fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, ubuf.colorProperty, 1); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag index 0a6cdf3044..6a2d8dc122 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag @@ -1,14 +1,23 @@ -uniform lowp sampler2D source; -uniform highp vec2 offset; -uniform highp vec2 delta; -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D source; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; + vec2 offset; + vec2 delta; +} ubuf; + void main() { - highp vec2 delta2 = vec2(delta.x, -delta.y); - lowp float shadow = 0.25 * (texture2D(source, qt_TexCoord0 - offset + delta).a - + texture2D(source, qt_TexCoord0 - offset - delta).a - + texture2D(source, qt_TexCoord0 - offset + delta2).a - + texture2D(source, qt_TexCoord0 - offset - delta2).a); - lowp vec4 color = texture2D(source, qt_TexCoord0); - gl_FragColor = mix(vec4(vec3(0.), 0.5 * shadow), color, color.a); + vec2 delta2 = vec2(ubuf.delta.x, -ubuf.delta.y); + float shadow = 0.25 * (texture(source, qt_TexCoord0 - ubuf.offset + ubuf.delta).a + + texture(source, qt_TexCoord0 - ubuf.offset - ubuf.delta).a + + texture(source, qt_TexCoord0 - ubuf.offset + delta2).a + + texture(source, qt_TexCoord0 - ubuf.offset - delta2).a); + vec4 color = texture(source, qt_TexCoord0); + fragColor = mix(vec4(vec3(0.), 0.5 * shadow), color, color.a); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag deleted file mode 100644 index 6a2d8dc122..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag +++ /dev/null @@ -1,23 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D source; - -layout(std140, binding = 0) uniform buf { - mat4 qt_Matrix; - float qt_Opacity; - vec2 offset; - vec2 delta; -} ubuf; - -void main() { - vec2 delta2 = vec2(ubuf.delta.x, -ubuf.delta.y); - float shadow = 0.25 * (texture(source, qt_TexCoord0 - ubuf.offset + ubuf.delta).a - + texture(source, qt_TexCoord0 - ubuf.offset - ubuf.delta).a - + texture(source, qt_TexCoord0 - ubuf.offset + delta2).a - + texture(source, qt_TexCoord0 - ubuf.offset - delta2).a); - vec4 color = texture(source, qt_TexCoord0); - fragColor = mix(vec4(vec3(0.), 0.5 * shadow), color, color.a); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag index 33c6cee064..734be73fdb 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag @@ -1,7 +1,11 @@ -uniform lowp sampler2D maskSource; -uniform lowp sampler2D colorSource; -varying highp vec2 qt_TexCoord0; -uniform lowp float qt_Opacity; +#version 440 + +layout(location = 0) in vec2 qt_TexCoord0; +layout(location = 0) out vec4 fragColor; + +layout(binding = 1) uniform sampler2D maskSource; +layout(binding = 2) uniform sampler2D colorSource; + void main() { - gl_FragColor = texture2D(maskSource, qt_TexCoord0).a * texture2D(colorSource, qt_TexCoord0.yx); + fragColor = texture(maskSource, qt_TexCoord0).a * texture(colorSource, qt_TexCoord0.yx); } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag deleted file mode 100644 index 734be73fdb..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag +++ /dev/null @@ -1,11 +0,0 @@ -#version 440 - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(binding = 1) uniform sampler2D maskSource; -layout(binding = 2) uniform sampler2D colorSource; - -void main() { - fragColor = texture(maskSource, qt_TexCoord0).a * texture(colorSource, qt_TexCoord0.yx); -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert index 2ab6f94c19..96494b7149 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert @@ -1,11 +1,17 @@ -uniform highp mat4 qt_Matrix; -attribute highp vec4 qt_Vertex; -attribute highp vec2 qt_MultiTexCoord0; -varying highp vec2 qt_TexCoord0; -uniform highp vec4 qt_SubRect_source; +#version 440 + +layout(location = 0) in vec4 qt_Vertex; +layout(location = 1) in vec2 qt_MultiTexCoord0; + +layout(location = 0) out vec2 qt_TexCoord0; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + vec4 qt_SubRect_source; +} ubuf; void main() { - qt_TexCoord0 = qt_SubRect_source.xy + qt_SubRect_source.zw * qt_MultiTexCoord0; - gl_Position = qt_Matrix * qt_Vertex; + qt_TexCoord0 = ubuf.qt_SubRect_source.xy + ubuf.qt_SubRect_source.zw * qt_MultiTexCoord0; + gl_Position = ubuf.qt_Matrix * qt_Vertex; } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert deleted file mode 100644 index 96494b7149..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert +++ /dev/null @@ -1,17 +0,0 @@ -#version 440 - -layout(location = 0) in vec4 qt_Vertex; -layout(location = 1) in vec2 qt_MultiTexCoord0; - -layout(location = 0) out vec2 qt_TexCoord0; - -layout(std140, binding = 0) uniform buf { - mat4 qt_Matrix; - vec4 qt_SubRect_source; -} ubuf; - -void main() -{ - qt_TexCoord0 = ubuf.qt_SubRect_source.xy + ubuf.qt_SubRect_source.zw * qt_MultiTexCoord0; - gl_Position = ubuf.qt_Matrix * qt_Vertex; -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert index 38e523c06b..38f6173773 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert @@ -1,12 +1,18 @@ -uniform highp mat4 qt_Matrix; -attribute highp vec4 qt_Vertex; -attribute highp vec2 qt_MultiTexCoord0; -varying highp vec2 qt_TexCoord0; +#version 440 + +layout(location = 0) in vec4 qt_Vertex; +layout(location = 1) in vec2 qt_MultiTexCoord0; + +layout(location = 0) out vec2 qt_TexCoord0; + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; +} ubuf; void main() { - highp vec4 pos = qt_Vertex; + vec4 pos = qt_Vertex; pos.x += sin(qt_Vertex.y * 0.02) * 20.; pos.y += sin(qt_Vertex.x * 0.02) * 20.; - gl_Position = qt_Matrix * pos; + gl_Position = ubuf.qt_Matrix * pos; qt_TexCoord0 = qt_MultiTexCoord0; } diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert deleted file mode 100644 index 38f6173773..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert +++ /dev/null @@ -1,18 +0,0 @@ -#version 440 - -layout(location = 0) in vec4 qt_Vertex; -layout(location = 1) in vec2 qt_MultiTexCoord0; - -layout(location = 0) out vec2 qt_TexCoord0; - -layout(std140, binding = 0) uniform buf { - mat4 qt_Matrix; -} ubuf; - -void main() { - vec4 pos = qt_Vertex; - pos.x += sin(qt_Vertex.y * 0.02) * 20.; - pos.y += sin(qt_Vertex.x * 0.02) * 20.; - gl_Position = ubuf.qt_Matrix * pos; - qt_TexCoord0 = qt_MultiTexCoord0; -} diff --git a/tests/manual/scenegraph_lancelot/data/shared/shared.qrc b/tests/manual/scenegraph_lancelot/data/shared/shared.qrc deleted file mode 100644 index 4bd955b2b2..0000000000 --- a/tests/manual/scenegraph_lancelot/data/shared/shared.qrc +++ /dev/null @@ -1,38 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>shaders/basic.frag</file> - <file>shaders/basic_alpha.frag</file> - <file>shaders/cmyk.frag</file> - <file>shaders/culling.frag</file> - <file>shaders/desaturate.frag</file> - <file>shaders/edge.frag</file> - <file>shaders/gradient.frag</file> - <file>shaders/gradient2.frag</file> - <file>shaders/gradient3.frag</file> - <file>shaders/gradient4.frag</file> - <file>shaders/gradient5.frag</file> - <file>shaders/gradientgrid.frag</file> - <file>shaders/property.frag</file> - <file>shaders/shadow.frag</file> - <file>shaders/stencil.frag</file> - <file>shaders/subrect.vert</file> - <file>shaders/wave.vert</file> - <file>shaders/+qsb/basic.frag</file> - <file>shaders/+qsb/basic_alpha.frag</file> - <file>shaders/+qsb/cmyk.frag</file> - <file>shaders/+qsb/culling.frag</file> - <file>shaders/+qsb/desaturate.frag</file> - <file>shaders/+qsb/edge.frag</file> - <file>shaders/+qsb/gradient.frag</file> - <file>shaders/+qsb/gradient2.frag</file> - <file>shaders/+qsb/gradient3.frag</file> - <file>shaders/+qsb/gradient4.frag</file> - <file>shaders/+qsb/gradient5.frag</file> - <file>shaders/+qsb/gradientgrid.frag</file> - <file>shaders/+qsb/property.frag</file> - <file>shaders/+qsb/shadow.frag</file> - <file>shaders/+qsb/stencil.frag</file> - <file>shaders/+qsb/subrect.vert</file> - <file>shaders/+qsb/wave.vert</file> - </qresource> -</RCC> |