Commit a5f5e777 by Jamie Madill Committed by Commit Bot

D3D11: Fix warning that showed up in VS2019.

Was related to the new D3D11on12 code. Bug: angleproject:3986 Change-Id: I801b816c620a7307ee5a236856949866a8daf747 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1854720Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 6950a87f
...@@ -719,13 +719,13 @@ HRESULT Renderer11::callD3D11On12CreateDevice(PFN_D3D12_CREATE_DEVICE createDevi ...@@ -719,13 +719,13 @@ HRESULT Renderer11::callD3D11On12CreateDevice(PFN_D3D12_CREATE_DEVICE createDevi
egl::Error Renderer11::initializeD3DDevice() egl::Error Renderer11::initializeD3DDevice()
{ {
HRESULT result = S_OK; HRESULT result = S_OK;
bool createD3D11on12Device = false; bool createD3D11on12Device = false;
if (!mCreatedWithDeviceEXT) if (!mCreatedWithDeviceEXT)
{ {
#if !defined(ANGLE_ENABLE_WINDOWS_UWP) #if !defined(ANGLE_ENABLE_WINDOWS_UWP)
PFN_D3D11_CREATE_DEVICE D3D11CreateDevice = nullptr; PFN_D3D11_CREATE_DEVICE D3D11CreateDevice = nullptr;
PFN_D3D12_CREATE_DEVICE D3D12CreateDevice = nullptr; PFN_D3D12_CREATE_DEVICE D3D12CreateDevice = nullptr;
PFN_D3D11ON12_CREATE_DEVICE D3D11on12CreateDevice = nullptr; PFN_D3D11ON12_CREATE_DEVICE D3D11on12CreateDevice = nullptr;
{ {
...@@ -739,7 +739,7 @@ egl::Error Renderer11::initializeD3DDevice() ...@@ -739,7 +739,7 @@ egl::Error Renderer11::initializeD3DDevice()
const egl::AttributeMap &attributes = mDisplay->getAttributeMap(); const egl::AttributeMap &attributes = mDisplay->getAttributeMap();
createD3D11on12Device = createD3D11on12Device =
static_cast<EGLint>(attributes.get(EGL_PLATFORM_ANGLE_D3D11ON12_ANGLE, EGL_FALSE)); attributes.get(EGL_PLATFORM_ANGLE_D3D11ON12_ANGLE, EGL_FALSE) == EGL_TRUE;
if (createD3D11on12Device) if (createD3D11on12Device)
{ {
......
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