commit 8e32884af9c0171974821c130f1c4b3e9cd59987
author Geoff Lang <geofflang@chromium.org> Mon Feb 10 13:11:20 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Thu Feb 20 16:35:24 2014 +0000
tree 09039ce49bfec58af88fad724c7d10609c7daeee
parent 94a9089bbb6224bf6c7c392fbde855823dac342d

Remove dependence on dxguid.lib for release builds.

BUG=angle:559

Change-Id: I10c93b312b4bf206e45d061eace2d00e598403bd
Reviewed-on: https://chromium-review.googlesource.com/185690
Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

src/libGLESv2.gypi

diff --git a/src/libGLESv2.gypi b/src/libGLESv2.gypi
index 6cb9a1a..cbfd966 100644
--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -64,7 +64,6 @@
                                 {
                                     'AdditionalDependencies':
                                     [
-                                        'dxguid.lib',
                                         'd3d9.lib',
                                     ]
                                 }
@@ -82,14 +81,20 @@
                             [
                                 'ANGLE_ENABLE_D3D11',
                             ],
-                            'msvs_settings':
+                            'configurations':
                             {
-                                'VCLinkerTool':
+                                'Debug':
                                 {
-                                    'AdditionalDependencies':
-                                    [
-                                        'dxguid.lib',
-                                    ]
+                                    'msvs_settings':
+                                    {
+                                        'VCLinkerTool':
+                                        {
+                                            'AdditionalDependencies':
+                                            [
+                                                'dxguid.lib',
+                                            ]
+                                        }
+                                    },
                                 }
                             },
                         }],

src/libGLESv2/renderer/d3d11/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/d3d11/Renderer11.cpp b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
index 1030153..be3af98 100644
--- a/src/libGLESv2/renderer/d3d11/Renderer11.cpp
+++ b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
@@ -2978,7 +2978,7 @@
 
             if (textureResource)
             {
-                HRESULT result = textureResource->QueryInterface(IID_ID3D11Texture2D, (void**)resource);
+                HRESULT result = textureResource->QueryInterface(__uuidof(ID3D11Texture2D), (void**)resource);
                 SafeRelease(textureResource);
 
                 if (SUCCEEDED(result))

src/libGLESv2/renderer/d3d9/Renderer9.cpp

diff --git a/src/libGLESv2/renderer/d3d9/Renderer9.cpp b/src/libGLESv2/renderer/d3d9/Renderer9.cpp
index 7aae33b..fde80b8 100644
--- a/src/libGLESv2/renderer/d3d9/Renderer9.cpp
+++ b/src/libGLESv2/renderer/d3d9/Renderer9.cpp
@@ -207,7 +207,7 @@
     {
         TRACE_EVENT0("gpu", "D3d9Ex_QueryInterface");
         ASSERT(mD3d9Ex);
-        mD3d9Ex->QueryInterface(IID_IDirect3D9, reinterpret_cast<void**>(&mD3d9));
+        mD3d9Ex->QueryInterface(__uuidof(IDirect3D9), reinterpret_cast<void**>(&mD3d9));
         ASSERT(mD3d9);
     }
     else
@@ -354,7 +354,7 @@
     if (mD3d9Ex)
     {
         TRACE_EVENT0("gpu", "mDevice_QueryInterface");
-        result = mDevice->QueryInterface(IID_IDirect3DDevice9Ex, (void**) &mDeviceEx);
+        result = mDevice->QueryInterface(__uuidof(IDirect3DDevice9Ex), (void**)&mDeviceEx);
         ASSERT(SUCCEEDED(result));
     }