From: John Bauman <jbauman@google.com>
Date: Tue, 6 May 2014 19:30:19 +0000 (-0400)
Subject: Fix on XP
X-Git-Tag: android-x86-7.1-r1~1472
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3779153de6ae62d4772334c4cd36c5ec189691cc;p=android-x86%2Fexternal-swiftshader.git

Fix on XP
---

diff --git a/src/OpenGL ES 2.0/libEGL/Surface.cpp b/src/OpenGL ES 2.0/libEGL/Surface.cpp
index d31ed1432..24bd01cab 100644
--- a/src/OpenGL ES 2.0/libEGL/Surface.cpp	
+++ b/src/OpenGL ES 2.0/libEGL/Surface.cpp	
@@ -28,6 +28,22 @@
 namespace egl
 {
 
+namespace
+{
+const int versionWindowsVista = MAKEWORD(0x00, 0x06);
+const int versionWindows7 = MAKEWORD(0x01, 0x06);
+
+// Return the version of the operating system in a format suitable for ordering
+// comparison.
+int getComparableOSVersion()
+{
+    DWORD version = GetVersion();
+    int majorVersion = LOBYTE(LOWORD(version));
+    int minorVersion = HIBYTE(LOWORD(version));
+    return MAKEWORD(minorVersion, majorVersion);
+}
+}
+
 Surface::Surface(Display *display, const Config *config, HWND window) 
     : mDisplay(display), mConfig(config), mWindow(window)
 {
@@ -85,7 +101,7 @@ bool Surface::initialize()
     // Modify present parameters for this window, if we are composited,
     // to minimize the amount of queuing done by DWM between our calls to
     // present and the actual screen.
-    if(mWindow && (LOWORD(GetVersion()) >= 0x60))
+    if (mWindow && (getComparableOSVersion() >= versionWindowsVista))
 	{
         BOOL isComposited;
         HRESULT result = DwmIsCompositionEnabled(&isComposited);
diff --git a/src/OpenGL ES 2.0/libGLESv2/libGLESv2.vcxproj b/src/OpenGL ES 2.0/libGLESv2/libGLESv2.vcxproj
index 5391f71ec..0bec62385 100644
--- a/src/OpenGL ES 2.0/libGLESv2/libGLESv2.vcxproj	
+++ b/src/OpenGL ES 2.0/libGLESv2/libGLESv2.vcxproj	
@@ -88,6 +88,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Lib\x86</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"
@@ -126,6 +127,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Lib\x86</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"