diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-08-30 12:16:18 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-08-30 16:17:16 +0200 |
| commit | fb4760bb217732d38c31943bfc8baa71a141ed08 (patch) | |
| tree | 44a7d1bf466856bebcdde50bed66e1c7c1924a18 | |
| parent | 49efc168e101f341565ef485bf1489196ae855a2 (diff) | |
rhi: gl: Also try GLSL 140 and 130
Change-Id: I21e3ca92d62f20f3ec608bef54c68f9bd09a207f
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| -rw-r--r-- | src/gui/rhi/qrhigles2.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp index 10f3a8f0a6..cd72a44b60 100644 --- a/src/gui/rhi/qrhigles2.cpp +++ b/src/gui/rhi/qrhigles2.cpp @@ -3329,23 +3329,27 @@ QByteArray QRhiGles2::shaderSource(const QRhiShaderStage &shaderStage, int *glsl } } else { if (caps.ctxMajor > 4 || (caps.ctxMajor == 4 && caps.ctxMinor >= 6)) { - versionsToTry << 460 << 450 << 440 << 430 << 420 << 410 << 400 << 330 << 150; + versionsToTry << 460 << 450 << 440 << 430 << 420 << 410 << 400 << 330 << 150 << 140 << 130; } else if (caps.ctxMajor == 4 && caps.ctxMinor == 5) { - versionsToTry << 450 << 440 << 430 << 420 << 410 << 400 << 330 << 150; + versionsToTry << 450 << 440 << 430 << 420 << 410 << 400 << 330 << 150 << 140 << 130; } else if (caps.ctxMajor == 4 && caps.ctxMinor == 4) { - versionsToTry << 440 << 430 << 420 << 410 << 400 << 330 << 150; + versionsToTry << 440 << 430 << 420 << 410 << 400 << 330 << 150 << 140 << 130; } else if (caps.ctxMajor == 4 && caps.ctxMinor == 3) { - versionsToTry << 430 << 420 << 410 << 400 << 330 << 150; + versionsToTry << 430 << 420 << 410 << 400 << 330 << 150 << 140 << 130; } else if (caps.ctxMajor == 4 && caps.ctxMinor == 2) { - versionsToTry << 420 << 410 << 400 << 330 << 150; + versionsToTry << 420 << 410 << 400 << 330 << 150 << 140 << 130; } else if (caps.ctxMajor == 4 && caps.ctxMinor == 1) { - versionsToTry << 410 << 400 << 330 << 150; + versionsToTry << 410 << 400 << 330 << 150 << 140 << 130; } else if (caps.ctxMajor == 4 && caps.ctxMinor == 0) { - versionsToTry << 400 << 330 << 150; + versionsToTry << 400 << 330 << 150 << 140 << 130; } else if (caps.ctxMajor == 3 && caps.ctxMinor == 3) { - versionsToTry << 330 << 150; + versionsToTry << 330 << 150 << 140 << 130; } else if (caps.ctxMajor == 3 && caps.ctxMinor == 2) { - versionsToTry << 150; + versionsToTry << 150 << 140 << 130; + } else if (caps.ctxMajor == 3 && caps.ctxMinor == 1) { + versionsToTry << 140 << 130; + } else if (caps.ctxMajor == 3 && caps.ctxMinor == 0) { + versionsToTry << 130; } if (!caps.coreProfile) versionsToTry << 120; |