changeset 5725:fa1f93d1bd33

Fix to RT-32525: [FX3D] 3D does not working with Windows 2008 R2 Reviewed-by: kcr, vadim
author Chien Yang <chien.yang@oracle.com>
date Sat, 16 Nov 2013 11:32:42 -0800
parents eea9adfd81dc
children 9cbdb5c0d9e6
files modules/graphics/src/main/native-prism-d3d/D3DPipelineManager.cc
diffstat 1 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/native-prism-d3d/D3DPipelineManager.cc	Fri Nov 15 16:45:48 2013 -0800
+++ b/modules/graphics/src/main/native-prism-d3d/D3DPipelineManager.cc	Sat Nov 16 11:32:42 2013 -0800
@@ -172,18 +172,14 @@
 HRESULT
 D3DPipelineManager::CheckOSVersion()
 {
-    // require Windows XP or newer client-class OS
-    if (OS::isWindowsXPorNewer() &&
-        !D3DPPLM_OsVersionMatches(OS_WINSERV_2008|OS_WINSERV_2003))
-    {
+    // require Windows XP or newer OS
+    if (OS::isWindowsXPorNewer()) {
         TraceLn(NWT_TRACE_INFO,
-                   "D3DPPLM::CheckOSVersion: Windows XP or newer client-classs"\
-                   " OS detected, passed");
+                   "D3DPPLM::CheckOSVersion: Windows XP or newer OS detected, passed");
         return S_OK;
     }
     RlsTraceLn(NWT_TRACE_ERROR,
-                  "D3DPPLM::CheckOSVersion: Windows 2000 or earlier (or a "\
-                  "server) OS detected, failed");
+                  "D3DPPLM::CheckOSVersion: Windows 2000 or earlier OS detected, failed");
     if (bNoHwCheck) {
         RlsTraceLn(NWT_TRACE_WARNING,
                       "  OS check overridden via NEWT_D3D_NO_HWCHECK");