Revise Intel GPU generations in gpu_info.json

Intel Xe is also called Intel Gen 12. Quite a few Intel architectures
are classified into Gen 12. Some of these architectures are Gen 12
LP (low power), while the others are Gen 12 HP (high performance,
for example, some Intel discrete GPUs). For more details, see
https://en.wikipedia.org/wiki/Intel_Xe. We need to separate Intel Gen
12 LP from Intel Gen 12 HP for some toggles on D3D12 backend.

Bug: dawn:949

Change-Id: Id5d10c0ecb31ca9e323ede65c3d55e6d4954370e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/97901
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: yang gu <yang.gu@intel.com>
Commit-Queue: Yunchao He <yunchao.he@intel.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Yunchao He 2022-08-02 18:10:05 +00:00 committed by Dawn LUCI CQ
parent e37f0a1943
commit 6f0884983f
2 changed files with 6 additions and 4 deletions

View File

@ -82,7 +82,8 @@
"Gen 8": ["0x1600", "0x2200"], "Gen 8": ["0x1600", "0x2200"],
"Gen 9": ["0x1900", "0x3100", "0x3E00", "0x5A00", "0x5900", "0x9B00"], "Gen 9": ["0x1900", "0x3100", "0x3E00", "0x5A00", "0x5900", "0x9B00"],
"Gen 11": ["0x8A00"], "Gen 11": ["0x8A00"],
"Xe": ["0x4600", "0x4C00", "0x4900", "0x9A00"] "Gen 12 LP": ["0x4600", "0x4C00", "0x4900", "0x9A00"],
"Gen 12 HP": ["0x4F00", "0x5600"]
} }
}, },

View File

@ -665,7 +665,8 @@ void Device::InitTogglesFromDriver() {
// Currently this workaround is only needed on Intel Gen12 GPUs. // Currently this workaround is only needed on Intel Gen12 GPUs.
// See http://crbug.com/dawn/1487 for more information. // See http://crbug.com/dawn/1487 for more information.
if (gpu_info::IsIntelXe(vendorId, deviceId)) { if (gpu_info::IsIntelGen12LP(vendorId, deviceId) ||
gpu_info::IsIntelGen12HP(vendorId, deviceId)) {
SetToggle(Toggle::D3D12DontSetClearValueOnDepthTextureCreation, true); SetToggle(Toggle::D3D12DontSetClearValueOnDepthTextureCreation, true);
} }
@ -676,7 +677,7 @@ void Device::InitTogglesFromDriver() {
// This workaround is only needed on Intel Gen12LP with driver prior to 30.0.101.1960. // This workaround is only needed on Intel Gen12LP with driver prior to 30.0.101.1960.
// See http://crbug.com/dawn/949 for more information. // See http://crbug.com/dawn/949 for more information.
if (gpu_info::IsIntelXe(vendorId, deviceId)) { if (gpu_info::IsIntelGen12LP(vendorId, deviceId)) {
const gpu_info::D3DDriverVersion version = {30, 0, 101, 1960}; const gpu_info::D3DDriverVersion version = {30, 0, 101, 1960};
if (gpu_info::CompareD3DDriverVersion(vendorId, ToBackend(GetAdapter())->GetDriverVersion(), if (gpu_info::CompareD3DDriverVersion(vendorId, ToBackend(GetAdapter())->GetDriverVersion(),
version) == -1) { version) == -1) {