Skip to content

Commit 2e4ef16

Browse files
RafaelCintronAngle LUCI CQ
authored andcommitted
Remove SupportsDXGI1_2 and Supporting Code
Per Microsoft docs, IDXGIAdapter2 will always be present on >= Win8 machines. Since Chromium and ANGLE only support >= Win10, we no longer need to track and report this histogram. Bug: chromium:475877310 Change-Id: Iba82ecd9c8ea7a406f3f8de6511da932c1607eee Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7487704 Commit-Queue: Rafael Cintron <rafael.cintron@microsoft.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>
1 parent 68d2778 commit 2e4ef16

3 files changed

Lines changed: 2 additions & 15 deletions

File tree

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@ Renderer11::Renderer11(egl::Display *display)
436436
mRenderer11DeviceCaps.supportsClearView = false;
437437
mRenderer11DeviceCaps.supportsConstantBufferOffsets = false;
438438
mRenderer11DeviceCaps.supportsVpRtIndexWriteFromVertexShader = false;
439-
mRenderer11DeviceCaps.supportsDXGI1_2 = false;
440439
mRenderer11DeviceCaps.allowES3OnFL10_0 = false;
441440
mRenderer11DeviceCaps.supportsTypedUAVLoadAdditionalFormats = false;
442441
mRenderer11DeviceCaps.supportsUAVLoadStoreCommonFormats = false;
@@ -1112,9 +1111,6 @@ egl::Error Renderer11::initializeDevice()
11121111
ASSERT(!mPixelTransfer);
11131112
mPixelTransfer = new PixelTransfer11(this);
11141113

1115-
// Gather stats on DXGI and D3D feature level
1116-
ANGLE_HISTOGRAM_BOOLEAN("GPU.ANGLE.SupportsDXGI1_2", mRenderer11DeviceCaps.supportsDXGI1_2);
1117-
11181114
ANGLEFeatureLevel angleFeatureLevel = GetANGLEFeatureLevel(mRenderer11DeviceCaps.featureLevel);
11191115

11201116
// We don't actually request a 11_1 device, because of complications with the platform
@@ -1231,10 +1227,6 @@ void Renderer11::populateRenderer11DeviceCaps()
12311227
PopulateFormatDeviceCaps(mDevice.Get(), DXGI_FORMAT_B5G5R5A1_UNORM,
12321228
&mRenderer11DeviceCaps.B5G5R5A1support,
12331229
&mRenderer11DeviceCaps.B5G5R5A1maxSamples);
1234-
1235-
angle::ComPtr<IDXGIAdapter2> dxgiAdapter2;
1236-
mDxgiAdapter.As(&dxgiAdapter2);
1237-
mRenderer11DeviceCaps.supportsDXGI1_2 = (dxgiAdapter2 != nullptr);
12381230
}
12391231

12401232
gl::SupportedSampleSet Renderer11::generateSampleSetForEGLConfig(
@@ -1434,8 +1426,7 @@ void Renderer11::generateDisplayExtensions(egl::DisplayExtensions *outExtensions
14341426
// If present path fast is active then the surface orientation extension isn't supported
14351427
outExtensions->surfaceOrientation = !mPresentPathFastEnabled;
14361428

1437-
// D3D11 does not support present with dirty rectangles until DXGI 1.2.
1438-
outExtensions->postSubBuffer = mRenderer11DeviceCaps.supportsDXGI1_2;
1429+
outExtensions->postSubBuffer = true;
14391430

14401431
outExtensions->image = true;
14411432
outExtensions->imageBase = true;

src/libANGLE/renderer/d3d/d3d11/Renderer11.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ struct Renderer11DeviceCaps
4949
Renderer11DeviceCaps();
5050

5151
D3D_FEATURE_LEVEL featureLevel;
52-
bool supportsDXGI1_2; // Support for DXGI 1.2
5352
bool supportsClearView; // Support for ID3D11DeviceContext1::ClearView
5453
bool supportsConstantBufferOffsets; // Support for Constant buffer offset
5554
bool supportsVpRtIndexWriteFromVertexShader; // VP/RT can be selected in the Vertex Shader

src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -654,10 +654,7 @@ EGLint SwapChain11::reset(DisplayD3D *displayD3D,
654654
}
655655
}
656656

657-
if (mRenderer->getRenderer11DeviceCaps().supportsDXGI1_2)
658-
{
659-
mSwapChain1 = d3d11::DynamicCastComObject<IDXGISwapChain1>(mSwapChain);
660-
}
657+
mSwapChain1 = d3d11::DynamicCastComObject<IDXGISwapChain1>(mSwapChain);
661658

662659
ID3D11Texture2D *backbufferTex = nullptr;
663660
hr = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D),

0 commit comments

Comments
 (0)