Commit 0f8d8c51 authored by Maggie Chen's avatar Maggie Chen Committed by Commit Bot

Add 11_1 and 11_0 to the GPU.D3D12FeatureLevel histogram

Bug: 775983
Change-Id: I552424ab846568863dfc76f6f0e12e2b4e92d474
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1993846Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Commit-Queue: Maggie Chen <magchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730031}
parent d0e2a075
...@@ -45,7 +45,9 @@ enum class D3D12FeatureLevel { ...@@ -45,7 +45,9 @@ enum class D3D12FeatureLevel {
kD3DFeatureLevelUnknown = 0, kD3DFeatureLevelUnknown = 0,
kD3DFeatureLevel_12_0 = 1, kD3DFeatureLevel_12_0 = 1,
kD3DFeatureLevel_12_1 = 2, kD3DFeatureLevel_12_1 = 2,
kMaxValue = kD3DFeatureLevel_12_1, kD3DFeatureLevel_11_0 = 3,
kD3DFeatureLevel_11_1 = 4,
kMaxValue = kD3DFeatureLevel_11_1,
}; };
inline D3D12FeatureLevel ConvertToHistogramFeatureLevel( inline D3D12FeatureLevel ConvertToHistogramFeatureLevel(
...@@ -57,6 +59,10 @@ inline D3D12FeatureLevel ConvertToHistogramFeatureLevel( ...@@ -57,6 +59,10 @@ inline D3D12FeatureLevel ConvertToHistogramFeatureLevel(
return D3D12FeatureLevel::kD3DFeatureLevel_12_0; return D3D12FeatureLevel::kD3DFeatureLevel_12_0;
case D3D_FEATURE_LEVEL_12_1: case D3D_FEATURE_LEVEL_12_1:
return D3D12FeatureLevel::kD3DFeatureLevel_12_1; return D3D12FeatureLevel::kD3DFeatureLevel_12_1;
case D3D_FEATURE_LEVEL_11_0:
return D3D12FeatureLevel::kD3DFeatureLevel_11_0;
case D3D_FEATURE_LEVEL_11_1:
return D3D12FeatureLevel::kD3DFeatureLevel_11_1;
default: default:
NOTREACHED(); NOTREACHED();
return D3D12FeatureLevel::kD3DFeatureLevelUnknown; return D3D12FeatureLevel::kD3DFeatureLevelUnknown;
...@@ -169,8 +175,9 @@ void GetGpuSupportedD3D12Version(Dx12VulkanVersionInfo* info) { ...@@ -169,8 +175,9 @@ void GetGpuSupportedD3D12Version(Dx12VulkanVersionInfo* info) {
} }
// The order of feature levels to attempt to create in D3D CreateDevice // The order of feature levels to attempt to create in D3D CreateDevice
const D3D_FEATURE_LEVEL feature_levels[] = {D3D_FEATURE_LEVEL_12_1, const D3D_FEATURE_LEVEL feature_levels[] = {
D3D_FEATURE_LEVEL_12_0}; D3D_FEATURE_LEVEL_12_1, D3D_FEATURE_LEVEL_12_0, D3D_FEATURE_LEVEL_11_1,
D3D_FEATURE_LEVEL_11_0};
PFN_D3D12_CREATE_DEVICE D3D12CreateDevice = PFN_D3D12_CREATE_DEVICE D3D12CreateDevice =
reinterpret_cast<PFN_D3D12_CREATE_DEVICE>( reinterpret_cast<PFN_D3D12_CREATE_DEVICE>(
...@@ -183,7 +190,7 @@ void GetGpuSupportedD3D12Version(Dx12VulkanVersionInfo* info) { ...@@ -183,7 +190,7 @@ void GetGpuSupportedD3D12Version(Dx12VulkanVersionInfo* info) {
if (SUCCEEDED(D3D12CreateDevice(nullptr, level, _uuidof(ID3D12Device), if (SUCCEEDED(D3D12CreateDevice(nullptr, level, _uuidof(ID3D12Device),
nullptr))) { nullptr))) {
info->d3d12_feature_level = level; info->d3d12_feature_level = level;
info->supports_dx12 = true; info->supports_dx12 = (level >= D3D_FEATURE_LEVEL_12_0) ? true : false;
break; break;
} }
} }
......
...@@ -13160,6 +13160,8 @@ to ensure that the crash string is shown properly on the user-facing crash UI. ...@@ -13160,6 +13160,8 @@ to ensure that the crash string is shown properly on the user-facing crash UI.
<int value="0" label="D3D_FEATURE_LEVEL_UNKNOWN"/> <int value="0" label="D3D_FEATURE_LEVEL_UNKNOWN"/>
<int value="1" label="D3D_FEATURE_LEVEL_12_0"/> <int value="1" label="D3D_FEATURE_LEVEL_12_0"/>
<int value="2" label="D3D_FEATURE_LEVEL_12_1"/> <int value="2" label="D3D_FEATURE_LEVEL_12_1"/>
<int value="3" label="D3D_FEATURE_LEVEL_11_0"/>
<int value="4" label="D3D_FEATURE_LEVEL_11_1"/>
</enum> </enum>
<enum name="D3D9InitializeResult"> <enum name="D3D9InitializeResult">
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