diff options
| author | Samuel Nevala <samuel.nevala@intopalo.com> | 2015-10-03 02:46:15 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-10-02 12:51:33 +0000 |
| commit | 44f323e5007a389c4103bfc6ca577d26078ce92b (patch) | |
| tree | 15d9d55cb0256e287438c4cdf939d03a402b4c46 /src/3rdparty/angle/src/libANGLE/renderer | |
| parent | b8e0f7cfc638a71770f44ada828ff2cf6d2ee201 (diff) | |
ANGLE: Fix D3D feature level detection.
Commit 7943d4f tried to fix this with a switch/case, but the feature
levels need to be in descending order so this failed. So, follow the
same style used for feature levels 10/11.
Change-Id: Ia1c22981bf8b99eb53df13833aba452482398295
Task-number: QTBUG-38481
Task-number: QTBUG-48571
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/renderer')
| -rw-r--r-- | src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp index ea5953fee8..223e2b019b 100644 --- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp @@ -293,25 +293,23 @@ Renderer11::Renderer11(egl::Display *display) #if defined(ANGLE_ENABLE_WINDOWS_STORE) if (requestedMajorVersion == EGL_DONT_CARE || requestedMajorVersion >= 9) #else - if (requestedMajorVersion == 9) + if (requestedMajorVersion == 9 && requestedMinorVersion == 3) #endif { - switch (requestedMinorVersion) { + if (requestedMinorVersion == EGL_DONT_CARE || requestedMinorVersion >= 3) + { + mAvailableFeatureLevels.push_back(D3D_FEATURE_LEVEL_9_3); + } #if defined(ANGLE_ENABLE_WINDOWS_STORE) - case EGL_DONT_CARE: - case 1: - mAvailableFeatureLevels.push_back(D3D_FEATURE_LEVEL_9_1); - // fall through - case 2: + if (requestedMinorVersion == EGL_DONT_CARE || requestedMinorVersion >= 2) + { mAvailableFeatureLevels.push_back(D3D_FEATURE_LEVEL_9_2); - // fall through -#endif - case 3: - mAvailableFeatureLevels.push_back(D3D_FEATURE_LEVEL_9_3); - break; - default: - break; } + if (requestedMinorVersion == EGL_DONT_CARE || requestedMinorVersion >= 1) + { + mAvailableFeatureLevels.push_back(D3D_FEATURE_LEVEL_9_1); + } +#endif } EGLint requestedDeviceType = attributes.get(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, |