Remove dependence on dxguid.lib for release builds.

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

Remove dependence on dxguid.lib for release builds.
8e32884a · Geoff Lang · 94a9089b · 8e32884a · 8e32884a · 8e32884a
Commit 8e32884a authored Feb 10, 2014 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 10 deletions

libGLESv2.gypi src/libGLESv2.gypi +12 -7

Renderer11.cpp src/libGLESv2/renderer/d3d11/Renderer11.cpp +1 -1

Renderer9.cpp src/libGLESv2/renderer/d3d9/Renderer9.cpp +2 -2

No files found.
--- 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':
+                                    'msvs_settings':
-                                    [
+                                    {
-                                        'dxguid.lib',
+                                        'VCLinkerTool':
-                                    ]
+                                        {
+                                            'AdditionalDependencies':
+                                            [
+                                                'dxguid.lib',
+                                            ]
+                                        }
+                                    },
                                }
                            },
                        }],

--- a/src/libGLESv2/renderer/d3d11/Renderer11.cpp
+++ b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
@@ -2978,7 +2978,7 @@ bool Renderer11::getRenderTargetResource(gl::Renderbuffer *colorbuffer, unsigned
            if (textureResource)
            {
-                HRESULT result = textureResource->QueryInterface(IID_ID3D11Texture2D, (void**)resource);
+                HRESULT result = textureResource->QueryInterface(__uuidof(ID3D11Texture2D), (void**)resource);
                SafeRelease(textureResource);
                if (SUCCEEDED(result))

--- a/src/libGLESv2/renderer/d3d9/Renderer9.cpp
+++ b/src/libGLESv2/renderer/d3d9/Renderer9.cpp
@@ -207,7 +207,7 @@ EGLint Renderer9::initialize()
    {
        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 @@ EGLint Renderer9::initialize()
    if (mD3d9Ex)
    {
        TRACE_EVENT0("gpu", "mDevice_QueryInterface");
-        result = mDevice->QueryInterface(IID_IDirect3DDevice9Ex, (void**) &mDeviceEx);
+        result = mDevice->QueryInterface(__uuidof(IDirect3DDevice9Ex), (void**)&mDeviceEx);
        ASSERT(SUCCEEDED(result));
    }