aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/scenegraph
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2021-02-18 19:21:28 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-19 15:33:31 +0000
commitd16d0c4bbf0667533b0f0748e9eb93f1ac2e973c (patch)
treed6e08e57721856e8ca19f43ad3392ba349a7419d /examples/quick/scenegraph
parentf839f2f3d6bcdc1a9b87a35b8f308ec5bc6c583d (diff)
Fix custommaterial example with OpenGL
The member names in the "uniform block" (which is in practice mapped to a struct uniform with GLSL) must match between the vertex and fragment shaders, even if the member is not used in one of the shaders. This is because OpenGL/GLSL's interface matching rules, which would cause the shader program fail to link due to a mismatch in the structs in the two shaders. Change-Id: I9a928b4b20fdff14530c16a93a52967ce6c328a3 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 21d9cd844e5c572b03b73400c110adc6fc78ae75) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/quick/scenegraph')
-rw-r--r--examples/quick/scenegraph/custommaterial/shaders/mandelbrot.frag.qsbbin2605 -> 2538 bytes
-rw-r--r--examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert2
-rw-r--r--examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert.qsbbin1643 -> 1547 bytes
3 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.frag.qsb b/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.frag.qsb
index dce5a9d934..550c0377ae 100644
--- a/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.frag.qsb
+++ b/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.frag.qsb
Binary files differ
diff --git a/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert b/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert
index 00c519cd9d..79813253d1 100644
--- a/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert
+++ b/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert
@@ -8,7 +8,7 @@ layout(location = 0) out vec2 vTexCoord;
layout(std140, binding = 0) uniform buf {
mat4 qt_Matrix;
float qt_Opacity;
- float scale;
+ float zoom;
vec2 center;
int limit;
} ubuf;
diff --git a/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert.qsb b/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert.qsb
index 445b986ebd..ba2904d1c9 100644
--- a/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert.qsb
+++ b/examples/quick/scenegraph/custommaterial/shaders/mandelbrot.vert.qsb
Binary files differ