diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-11-27 21:15:47 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-12-02 15:47:37 +0100 |
| commit | 1ac0c5ef3f63e864cc018564a3057a7d26c85146 (patch) | |
| tree | e0db4e77472962e7d00ccb55293262764684e99d | |
| parent | 8c377eab73c9a6d09fb7b05fd5639369ee86dc99 (diff) | |
fix few problems
Change-Id: I4216ec60c7cf07bd92a157f4a86e2560cdbdca93
| -rw-r--r-- | vcl/opengl/win/WinDeviceInfo.cxx | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx index f8c86e36ef08..41f1a2b7db9b 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -344,6 +344,7 @@ bool ParseDriverVersion(const OUString& aVersion, uint64_t *aNumericVersion) template<typename T> void appendIntegerWithPadding(OUString& rString, T value, sal_uInt32 nChars) { + rString += "0x"; OUString aValue = OUString::number(value, 16); sal_Int32 nLength = aValue.getLength(); sal_uInt32 nPadLength = nChars - nLength; @@ -573,6 +574,7 @@ WinOpenGLDeviceInfo::WinOpenGLDeviceInfo(): mbRDP(false) { GetData(); + FillBlacklist(); } WinOpenGLDeviceInfo::~WinOpenGLDeviceInfo() @@ -617,36 +619,35 @@ bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList() } } -#if defined(XP_WIN) || defined(ANDROID) switch (maDriverInfo[i].meComparisonOp) { - case DRIVER_LESS_THAN: + case wgl::DRIVER_LESS_THAN: match = driverVersion < maDriverInfo[i].mnDriverVersion; break; - case DRIVER_LESS_THAN_OR_EQUAL: + case wgl::DRIVER_LESS_THAN_OR_EQUAL: match = driverVersion <= maDriverInfo[i].mnDriverVersion; break; - case DRIVER_GREATER_THAN: + case wgl::DRIVER_GREATER_THAN: match = driverVersion > maDriverInfo[i].mnDriverVersion; break; - case DRIVER_GREATER_THAN_OR_EQUAL: + case wgl::DRIVER_GREATER_THAN_OR_EQUAL: match = driverVersion >= maDriverInfo[i].mnDriverVersion; break; - case DRIVER_EQUAL: + case wgl::DRIVER_EQUAL: match = driverVersion == maDriverInfo[i].mnDriverVersion; break; - case DRIVER_NOT_EQUAL: + case wgl::DRIVER_NOT_EQUAL: match = driverVersion != maDriverInfo[i].mnDriverVersion; break; - case DRIVER_BETWEEN_EXCLUSIVE: + case wgl::DRIVER_BETWEEN_EXCLUSIVE: match = driverVersion > maDriverInfo[i].mnDriverVersion && driverVersion < maDriverInfo[i].mnDriverVersionMax; break; - case DRIVER_BETWEEN_INCLUSIVE: + case wgl::DRIVER_BETWEEN_INCLUSIVE: match = driverVersion >= maDriverInfo[i].mnDriverVersion && driverVersion <= maDriverInfo[i].mnDriverVersionMax; break; - case DRIVER_BETWEEN_INCLUSIVE_START: + case wgl::DRIVER_BETWEEN_INCLUSIVE_START: match = driverVersion >= maDriverInfo[i].mnDriverVersion && driverVersion < maDriverInfo[i].mnDriverVersionMax; break; - case DRIVER_COMPARISON_IGNORED: + case wgl::DRIVER_COMPARISON_IGNORED: // We don't have a comparison op, so we match everything. match = true; break; @@ -654,11 +655,6 @@ bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList() SAL_WARN("vcl.opengl", "Bogus op in GfxDriverInfo"); break; } -#else - // We don't care what driver version it was. We only check OS version and if - // the device matches. - match = true; -#endif if (match || maDriverInfo[i].mnDriverVersion == wgl::DriverInfo::allDriverVersions) { match = true; |