Skip to content

A
angle
Commit 67527cb4 by Josh Matthews Committed by Commit Bot
Options

Fix compilation on UWP targets.

Bug: angleproject:4053 Change-Id: Iaa358c8ce61d0ebaae11672bfb6dac2d3e847be1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1881343Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent c898ec1a
Showing with 12 additions and 7 deletions
CONTRIBUTORS
......@@ -90,6 +90,7 @@ Mozilla Corp.
Benoit Jacob
Makoto Kato
Vladimir Vukicevic
Josh Matthews
Turbulenz
Michael Braithwaite
......
src/libANGLE/Display.cpp
......@@ -1258,7 +1258,11 @@ static ClientExtensions GenerateClientExtensions()
#endif
#if defined(ANGLE_ENABLE_D3D11)
# if defined(ANGLE_ENABLE_WINDOWS_UWP)
extensions.platformANGLED3D11ON12 = true;
# else
extensions.platformANGLED3D11ON12 = IsWindows10OrGreater();
# endif
#endif
#if defined(ANGLE_ENABLE_OPENGL)
......
src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
......@@ -727,7 +727,7 @@ egl::Error Renderer11::initializeD3DDevice()
#if !defined(ANGLE_ENABLE_WINDOWS_UWP)
PFN_D3D11_CREATE_DEVICE D3D11CreateDevice = nullptr;
PFN_D3D12_CREATE_DEVICE D3D12CreateDevice = nullptr;
PFN_D3D11ON12_CREATE_DEVICE D3D11on12CreateDevice = nullptr;
PFN_D3D11ON12_CREATE_DEVICE D3D11On12CreateDevice = nullptr;
{
ANGLE_TRACE_EVENT0("gpu.angle", "Renderer11::initialize (Load DLLs)");
mDxgiModule = LoadLibrary(TEXT("dxgi.dll"));
......@@ -758,9 +758,9 @@ egl::Error Renderer11::initializeD3DDevice()
<< "Could not retrieve D3D12CreateDevice address.";
}
D3D11on12CreateDevice = reinterpret_cast<PFN_D3D11ON12_CREATE_DEVICE>(
D3D11On12CreateDevice = reinterpret_cast<PFN_D3D11ON12_CREATE_DEVICE>(
GetProcAddress(mD3d11Module, "D3D11On12CreateDevice"));
if (D3D11on12CreateDevice == nullptr)
if (D3D11On12CreateDevice == nullptr)
{
return egl::EglNotInitialized(D3D11_INIT_MISSING_DEP)
<< "Could not retrieve D3D11On12CreateDevice address.";
......@@ -791,7 +791,7 @@ egl::Error Renderer11::initializeD3DDevice()
ANGLE_TRACE_EVENT0("gpu.angle", "D3D11CreateDevice (Debug)");
if (createD3D11on12Device)
{
result = callD3D11On12CreateDevice(D3D12CreateDevice, D3D11on12CreateDevice, true);
result = callD3D11On12CreateDevice(D3D12CreateDevice, D3D11On12CreateDevice, true);
}
else
{
......@@ -808,7 +808,7 @@ egl::Error Renderer11::initializeD3DDevice()
if (createD3D11on12Device)
{
result =
callD3D11On12CreateDevice(D3D12CreateDevice, D3D11on12CreateDevice, true);
callD3D11On12CreateDevice(D3D12CreateDevice, D3D11On12CreateDevice, true);
}
else
{
......@@ -827,7 +827,7 @@ egl::Error Renderer11::initializeD3DDevice()
ANGLE_TRACE_EVENT0("gpu.angle", "D3D11CreateDevice");
if (createD3D11on12Device)
{
result = callD3D11On12CreateDevice(D3D12CreateDevice, D3D11on12CreateDevice, false);
result = callD3D11On12CreateDevice(D3D12CreateDevice, D3D11On12CreateDevice, false);
}
else
{
......@@ -844,7 +844,7 @@ egl::Error Renderer11::initializeD3DDevice()
if (createD3D11on12Device)
{
result =
callD3D11On12CreateDevice(D3D12CreateDevice, D3D11on12CreateDevice, false);
callD3D11On12CreateDevice(D3D12CreateDevice, D3D11On12CreateDevice, false);
}
else
{
......
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