[Libreoffice-commits] core.git: vcl/inc vcl/opengl vcl/qa
Gabor Kelemen (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jul 8 00:50:49 UTC 2019
vcl/inc/opengl/win/WinDeviceInfo.hxx | 3 ---
vcl/opengl/opengl_blacklist_windows.xml | 12 +-----------
vcl/opengl/win/WinDeviceInfo.cxx | 9 ---------
vcl/opengl/win/blocklist_parser.cxx | 12 ------------
vcl/qa/cppunit/blocklistparsertest.cxx | 25 +------------------------
vcl/qa/cppunit/test_blocklist_evaluate.xml | 11 +----------
vcl/qa/cppunit/test_blocklist_parse.xml | 18 ------------------
7 files changed, 3 insertions(+), 87 deletions(-)
New commits:
commit 49422a469646ad8be43ba828ca24c2484c26b9e8
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Mon Jul 1 16:51:02 2019 +0200
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Jul 8 02:50:07 2019 +0200
Do not support GL blacklisting for Windows versions older than 7
Since we no longer install on such systems anyway
Change-Id: Ia3b5c202e1276857c97017bb5a7eb9f087d5626e
Reviewed-on: https://gerrit.libreoffice.org/74961
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index b207b2f9c9df..773be7af0f7d 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -22,9 +22,6 @@ namespace wgl {
enum OperatingSystem {
DRIVER_OS_UNKNOWN = 0,
- DRIVER_OS_WINDOWS_XP,
- DRIVER_OS_WINDOWS_SERVER_2003,
- DRIVER_OS_WINDOWS_VISTA,
DRIVER_OS_WINDOWS_7,
DRIVER_OS_WINDOWS_8,
DRIVER_OS_WINDOWS_8_1,
diff --git a/vcl/opengl/opengl_blacklist_windows.xml b/vcl/opengl/opengl_blacklist_windows.xml
index 4ed2bb2c61ba..034838b73f14 100644
--- a/vcl/opengl/opengl_blacklist_windows.xml
+++ b/vcl/opengl/opengl_blacklist_windows.xml
@@ -9,7 +9,7 @@
<!--
entry attributes:
- os - "all", "xp", "server2003", "vista", "7", "8", "8_1", "10"
+ os - "all", "7", "8", "8_1", "10"
vendor - "all", "intel", "ati", "amd", "nvidia", "microsoft"
compare - "less", "less_equal", "greater", "greater_equal", "equal", "not_equal", "between_exclusive", "between_inclusive", "between_inclusive_start"
version
@@ -56,15 +56,5 @@
<entry os="all" vendor="microsoft" compare="less" version="6.2.0.0"> <!-- 6.2.0.0 -->
<device id="all"/>
</entry>
-
- <entry os="xp" vendor="all">
- <device id="all"/>
- </entry>
- <entry os="server2003" vendor="all">
- <device id="all"/>
- </entry>
- <entry os="vista" vendor="all">
- <device id="all"/>
- </entry>
</blacklist>
</root>
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 2ebccf9ee6f4..5c86d9aca22f 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -153,9 +153,6 @@ uint32_t ParseIDFromDeviceID(const OUString &key, const char *prefix, int length
// based on http://msdn.microsoft.com/en-us/library/ms724834(VS.85).aspx
enum {
kWindowsUnknown = 0,
- kWindowsXP = 0x00050001,
- kWindowsServer2003 = 0x00050002,
- kWindowsVista = 0x00060000,
kWindows7 = 0x00060001,
kWindows8 = 0x00060002,
kWindows8_1 = 0x00060003,
@@ -167,12 +164,6 @@ wgl::OperatingSystem WindowsVersionToOperatingSystem(int32_t aWindowsVersion)
{
switch(aWindowsVersion)
{
- case kWindowsXP:
- return wgl::DRIVER_OS_WINDOWS_XP;
- case kWindowsServer2003:
- return wgl::DRIVER_OS_WINDOWS_SERVER_2003;
- case kWindowsVista:
- return wgl::DRIVER_OS_WINDOWS_VISTA;
case kWindows7:
return wgl::DRIVER_OS_WINDOWS_7;
case kWindows8:
diff --git a/vcl/opengl/win/blocklist_parser.cxx b/vcl/opengl/win/blocklist_parser.cxx
index ab89c0e4d567..d7dd5de26258 100644
--- a/vcl/opengl/win/blocklist_parser.cxx
+++ b/vcl/opengl/win/blocklist_parser.cxx
@@ -33,18 +33,6 @@ wgl::OperatingSystem getOperatingSystem(const OString& rString)
{
return wgl::DRIVER_OS_ALL;
}
- else if (rString == "xp")
- {
- return wgl::DRIVER_OS_WINDOWS_XP;
- }
- else if (rString == "server2003")
- {
- return wgl::DRIVER_OS_WINDOWS_SERVER_2003;
- }
- else if (rString == "vista")
- {
- return wgl::DRIVER_OS_WINDOWS_VISTA;
- }
else if (rString == "7")
{
return wgl::DRIVER_OS_WINDOWS_7;
diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx b/vcl/qa/cppunit/blocklistparsertest.cxx
index f9a692585ca0..7d99e87f3750 100644
--- a/vcl/qa/cppunit/blocklistparsertest.cxx
+++ b/vcl/qa/cppunit/blocklistparsertest.cxx
@@ -40,7 +40,7 @@ void BlocklistParserTest::testParse()
aBlocklistParser.parse();
size_t const n = aDriveInfos.size();
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(22), n);
+ CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(16), n);
size_t i = 0;
@@ -54,23 +54,6 @@ void BlocklistParserTest::testParse()
aDriveInfo = aDriveInfos[i++];
CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted);
- CPPUNIT_ASSERT_EQUAL(WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorIntel), aDriveInfo.maAdapterVendor);
- CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_LESS_THAN_OR_EQUAL, aDriveInfo.meComparisonOp);
- CPPUNIT_ASSERT_EQUAL(wgl::V(11,21,31,41), aDriveInfo.mnDriverVersion);
-
- aDriveInfo = aDriveInfos[i++];
- CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted);
- CPPUNIT_ASSERT_EQUAL(WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorATI), aDriveInfo.maAdapterVendor);
- CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_GREATER_THAN, aDriveInfo.meComparisonOp);
- CPPUNIT_ASSERT_EQUAL(wgl::V(12,22,32,42), aDriveInfo.mnDriverVersion);
-
- aDriveInfo = aDriveInfos[i++];
- CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted);
- CPPUNIT_ASSERT_EQUAL(WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorAMD), aDriveInfo.maAdapterVendor);
- CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_GREATER_THAN_OR_EQUAL, aDriveInfo.meComparisonOp);
-
- aDriveInfo = aDriveInfos[i++];
- CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted);
CPPUNIT_ASSERT_EQUAL(WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorNVIDIA), aDriveInfo.maAdapterVendor);
CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_EQUAL, aDriveInfo.meComparisonOp);
@@ -118,17 +101,11 @@ void BlocklistParserTest::testEvaluate()
OUString vendorIntel = WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorIntel);
OUString vendorMicrosoft = WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorMicrosoft);
- uint32_t const osWindowsXP = 0x00050001;
- uint32_t const osWindowsVista = 0x00060000;
uint32_t const osWindows7 = 0x00060001;
uint32_t const osWindows8 = 0x00060002;
uint32_t const osWindows10 = 0x000A0000;
// Check OS
- CPPUNIT_ASSERT_EQUAL(true, WinOpenGLDeviceInfo::FindBlocklistedDeviceInList(
- aDriveInfos, "10.20.30.40", vendorNVIDIA, "all", osWindowsXP));
- CPPUNIT_ASSERT_EQUAL(true, WinOpenGLDeviceInfo::FindBlocklistedDeviceInList(
- aDriveInfos, "10.20.30.40", vendorNVIDIA, "all", osWindowsVista));
CPPUNIT_ASSERT_EQUAL(false, WinOpenGLDeviceInfo::FindBlocklistedDeviceInList(
aDriveInfos, "10.20.30.40", vendorNVIDIA, "all", osWindows7));
CPPUNIT_ASSERT_EQUAL(false, WinOpenGLDeviceInfo::FindBlocklistedDeviceInList(
diff --git a/vcl/qa/cppunit/test_blocklist_evaluate.xml b/vcl/qa/cppunit/test_blocklist_evaluate.xml
index 7ffbe3a1b588..dbcee17a1b18 100644
--- a/vcl/qa/cppunit/test_blocklist_evaluate.xml
+++ b/vcl/qa/cppunit/test_blocklist_evaluate.xml
@@ -9,7 +9,7 @@
<!--
entry attributes:
- os - "all", "xp", "server2003", "vista", "7", "8", "8_1", "10"
+ os - "all", "7", "8", "8_1", "10"
vendor - "all", "intel", "ati", "amd", "nvidia", "microsoft"
compare - "less", "less_equal", "greater", "greater_equal", "equal", "not_equal", "between_exclusive", "between_inclusive", "between_inclusive_start"
version
@@ -21,15 +21,6 @@
<whitelist>
</whitelist>
<blacklist>
- <entry os="xp" vendor="all">
- <device id="all"/>
- </entry>
- <entry os="server2003" vendor="all">
- <device id="all"/>
- </entry>
- <entry os="vista" vendor="all">
- <device id="all"/>
- </entry>
<entry os="all" vendor="amd" compare="less" version="10.20.30.40">
<device id="all"/>
diff --git a/vcl/qa/cppunit/test_blocklist_parse.xml b/vcl/qa/cppunit/test_blocklist_parse.xml
index 72ba4059115a..f9af4cb5418e 100644
--- a/vcl/qa/cppunit/test_blocklist_parse.xml
+++ b/vcl/qa/cppunit/test_blocklist_parse.xml
@@ -12,15 +12,6 @@
<entry os="all" vendor="all" compare="less" version="10.20.30.40">
<device id="all"/>
</entry>
- <entry os="xp" vendor="intel" compare="less_equal" version="11.21.31.41">
- <device id="all"/>
- </entry>
- <entry os="server2003" vendor="ati" compare="greater" version="12.22.32.42">
- <device id="all"/>
- </entry>
- <entry os="vista" vendor="amd" compare="greater_equal" version="10.20.30.40">
- <device id="all"/>
- </entry>
<entry os="7" vendor="nvidia" compare="equal" version="10.20.30.40">
<device id="all"/>
</entry>
@@ -47,15 +38,6 @@
<entry os="all" vendor="all" compare="less" version="10.20.30.40">
<device id="all"/>
</entry>
- <entry os="xp" vendor="intel" compare="less_equal" version="11.21.31.41">
- <device id="all"/>
- </entry>
- <entry os="server2003" vendor="ati" compare="greater" version="12.22.32.42">
- <device id="all"/>
- </entry>
- <entry os="vista" vendor="amd" compare="greater_equal" version="10.20.30.40">
- <device id="all"/>
- </entry>
<entry os="7" vendor="nvidia" compare="equal" version="10.20.30.40">
<device id="all"/>
</entry>
More information about the Libreoffice-commits
mailing list