diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2024-01-15 16:38:19 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-16 10:29:22 +0000 |
| commit | 4c960739e0a27d3585c846c1ef5c9be9ebb38c14 (patch) | |
| tree | d27c194519d30af8c1c3eb8080b94d7ea91ac610 | |
| parent | 994be9f2fef5ae94441185246622323ea0cef41f (diff) | |
Scene3DMaterial shaders: provide versions for GLSL 120 and 130
Pick-to: 6.5
Change-Id: Ia9aee43e03ed9efb8538e6cd7b25fa06fa5cb97d
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 02fd5255ba03c1f1a5172ec2c9cc917d2e738079)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f8743acf7bed1d5667626cc8b4fa7ee075c70b90)
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp | 4 | ||||
| -rw-r--r-- | src/quick3d/imports/scene3d/shaders/scene3dmaterial.frag.qsb | bin | 1776 -> 1680 bytes | |||
| -rw-r--r-- | src/quick3d/imports/scene3d/shaders/scene3dmaterial.vert.qsb | bin | 1920 -> 1793 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp index 12d396735..16d5942dd 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp +++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp @@ -40,8 +40,8 @@ Scene3DSGMaterialShader::Scene3DSGMaterialShader() : QSGMaterialShader() { // Generated with qsb, we target all GL version Qt3D can handle - // qsb -b --glsl "460,450,440,430,420,410,400,330,150,120,320 es,300 es,100 es" --hlsl 50 --msl 12 -o scene3dmaterial.vert.qsb scene3dmaterial.vert - // qsb --glsl "460,450,440,430,420,410,400,330,150,120,320 es,300 es,100 es" --hlsl 50 --msl 12 -o scene3dmaterial.frag.qsb scene3dmaterial.frag + // qsb -b --glsl "460,450,440,430,420,410,400,330,150,130,120,320 es,300 es,100 es" --hlsl 50 --msl 12 -o scene3dmaterial.vert.qsb scene3dmaterial.vert + // qsb --glsl "460,450,440,430,420,410,400,330,150,130,120,320 es,300 es,100 es" --hlsl 50 --msl 12 -o scene3dmaterial.frag.qsb scene3dmaterial.frag setShaderFileName(VertexStage, QLatin1String(":/shaders/scene3dmaterial.vert.qsb")); setShaderFileName(FragmentStage, QLatin1String(":/shaders/scene3dmaterial.frag.qsb")); } diff --git a/src/quick3d/imports/scene3d/shaders/scene3dmaterial.frag.qsb b/src/quick3d/imports/scene3d/shaders/scene3dmaterial.frag.qsb Binary files differindex b24ef4019..18a00e79b 100644 --- a/src/quick3d/imports/scene3d/shaders/scene3dmaterial.frag.qsb +++ b/src/quick3d/imports/scene3d/shaders/scene3dmaterial.frag.qsb diff --git a/src/quick3d/imports/scene3d/shaders/scene3dmaterial.vert.qsb b/src/quick3d/imports/scene3d/shaders/scene3dmaterial.vert.qsb Binary files differindex 6e17b49fb..ff27bb16d 100644 --- a/src/quick3d/imports/scene3d/shaders/scene3dmaterial.vert.qsb +++ b/src/quick3d/imports/scene3d/shaders/scene3dmaterial.vert.qsb |