diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2018-07-18 14:04:10 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2018-07-18 13:44:09 +0000 |
| commit | ee53b5366eb925b2fbe3cd28209e2f8c7bc9e143 (patch) | |
| tree | 3bfa24abcc187d3a587efc75d01b9769828c18e8 | |
| parent | b2b74b9eb4b82d1b2047d52376ec03d01864653d (diff) | |
QSkyboxEntity fixes:
Was setting the major version instead of minor version thus potentially
never allowing technique/pass filtering to ever succeed.
Update shaders/technique to target 3.3 as 3.0/3.1 might not work on mac.
Change-Id: I48c0ee54aac4a017cf8ac5ff3219b788a15bbcdd
Task-number: QTBUG-69522
Reviewed-by: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | src/extras/defaults/qskyboxentity.cpp | 6 | ||||
| -rw-r--r-- | src/extras/shaders/gl3/skybox.frag | 2 | ||||
| -rw-r--r-- | src/extras/shaders/gl3/skybox.vert | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/extras/defaults/qskyboxentity.cpp b/src/extras/defaults/qskyboxentity.cpp index df6547083..9cd199f1a 100644 --- a/src/extras/defaults/qskyboxentity.cpp +++ b/src/extras/defaults/qskyboxentity.cpp @@ -104,17 +104,17 @@ void QSkyboxEntityPrivate::init() m_gl3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL); m_gl3Technique->graphicsApiFilter()->setMajorVersion(3); - m_gl3Technique->graphicsApiFilter()->setMajorVersion(1); + m_gl3Technique->graphicsApiFilter()->setMinorVersion(3); m_gl3Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile); m_gl2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL); m_gl2Technique->graphicsApiFilter()->setMajorVersion(2); - m_gl2Technique->graphicsApiFilter()->setMajorVersion(0); + m_gl2Technique->graphicsApiFilter()->setMinorVersion(0); m_gl2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); m_es2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES); m_es2Technique->graphicsApiFilter()->setMajorVersion(2); - m_es2Technique->graphicsApiFilter()->setMajorVersion(0); + m_es2Technique->graphicsApiFilter()->setMinorVersion(0); m_es2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); m_filterKey->setParent(m_effect); diff --git a/src/extras/shaders/gl3/skybox.frag b/src/extras/shaders/gl3/skybox.frag index d8d23990f..ceb13b628 100644 --- a/src/extras/shaders/gl3/skybox.frag +++ b/src/extras/shaders/gl3/skybox.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 in vec3 texCoord0; out vec4 fragColor; diff --git a/src/extras/shaders/gl3/skybox.vert b/src/extras/shaders/gl3/skybox.vert index a92303aa8..cac49893a 100644 --- a/src/extras/shaders/gl3/skybox.vert +++ b/src/extras/shaders/gl3/skybox.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 in vec3 vertexPosition; out vec3 texCoord0; |