Commit 8e32884a by Geoff Lang

Remove dependence on dxguid.lib for release builds.

BUG=angle:559 Change-Id: I10c93b312b4bf206e45d061eace2d00e598403bd Reviewed-on: https://chromium-review.googlesource.com/185690Tested-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org>
parent 94a9089b
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
{ {
'AdditionalDependencies': 'AdditionalDependencies':
[ [
'dxguid.lib',
'd3d9.lib', 'd3d9.lib',
] ]
} }
...@@ -82,6 +81,10 @@ ...@@ -82,6 +81,10 @@
[ [
'ANGLE_ENABLE_D3D11', 'ANGLE_ENABLE_D3D11',
], ],
'configurations':
{
'Debug':
{
'msvs_settings': 'msvs_settings':
{ {
'VCLinkerTool': 'VCLinkerTool':
...@@ -92,6 +95,8 @@ ...@@ -92,6 +95,8 @@
] ]
} }
}, },
}
},
}], }],
], ],
......
...@@ -2978,7 +2978,7 @@ bool Renderer11::getRenderTargetResource(gl::Renderbuffer *colorbuffer, unsigned ...@@ -2978,7 +2978,7 @@ bool Renderer11::getRenderTargetResource(gl::Renderbuffer *colorbuffer, unsigned
if (textureResource) if (textureResource)
{ {
HRESULT result = textureResource->QueryInterface(IID_ID3D11Texture2D, (void**)resource); HRESULT result = textureResource->QueryInterface(__uuidof(ID3D11Texture2D), (void**)resource);
SafeRelease(textureResource); SafeRelease(textureResource);
if (SUCCEEDED(result)) if (SUCCEEDED(result))
......
...@@ -207,7 +207,7 @@ EGLint Renderer9::initialize() ...@@ -207,7 +207,7 @@ EGLint Renderer9::initialize()
{ {
TRACE_EVENT0("gpu", "D3d9Ex_QueryInterface"); TRACE_EVENT0("gpu", "D3d9Ex_QueryInterface");
ASSERT(mD3d9Ex); ASSERT(mD3d9Ex);
mD3d9Ex->QueryInterface(IID_IDirect3D9, reinterpret_cast<void**>(&mD3d9)); mD3d9Ex->QueryInterface(__uuidof(IDirect3D9), reinterpret_cast<void**>(&mD3d9));
ASSERT(mD3d9); ASSERT(mD3d9);
} }
else else
...@@ -354,7 +354,7 @@ EGLint Renderer9::initialize() ...@@ -354,7 +354,7 @@ EGLint Renderer9::initialize()
if (mD3d9Ex) if (mD3d9Ex)
{ {
TRACE_EVENT0("gpu", "mDevice_QueryInterface"); TRACE_EVENT0("gpu", "mDevice_QueryInterface");
result = mDevice->QueryInterface(IID_IDirect3DDevice9Ex, (void**) &mDeviceEx); result = mDevice->QueryInterface(__uuidof(IDirect3DDevice9Ex), (void**)&mDeviceEx);
ASSERT(SUCCEEDED(result)); ASSERT(SUCCEEDED(result));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment