1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: gl: Also try GLSL 140 and 130

Browse Source 
Change-Id: I21e3ca92d62f20f3ec608bef54c68f9bd09a207f
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Laszlo Agocs 2020-08-30 12:16:18 +02:00
parent 49efc168e1
commit fb4760bb21
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/rhi/qrhigles2.cpp
View File

@ -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;