diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-07-01 16:51:02 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-07-08 02:50:07 +0200 |
| commit | 49422a469646ad8be43ba828ca24c2484c26b9e8 (patch) | |
| tree | fa5bd801fbc206988f66718611f5d8ce4b96adc5 /vcl/opengl | |
| parent | e390011efa79588eca7ff7a3976a9ca3b3a780a4 (diff) | |
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@gmail.com>
Diffstat (limited to 'vcl/opengl')
| -rw-r--r-- | vcl/opengl/opengl_blacklist_windows.xml | 12 | ||||
| -rw-r--r-- | vcl/opengl/win/WinDeviceInfo.cxx | 9 | ||||
| -rw-r--r-- | vcl/opengl/win/blocklist_parser.cxx | 12 |
3 files changed, 1 insertions, 32 deletions
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; |