[dawn] Remove wgpu::FeatureName::R8UnormStorage. It has been superseded by TextureFormatTier1. Bug: 472926167 Change-Id: Iebb546488a455ab4ca0b7ce84f468219565d9e52 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/282795 Reviewed-by: Loko Kung <lokokung@google.com> Auto-Submit: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Fr <beaufort.francois@gmail.com> Commit-Queue: Loko Kung <lokokung@google.com>
diff --git a/docs/dawn/features/r8unorm_storage.md b/docs/dawn/features/r8unorm_storage.md deleted file mode 100644 index 11123fe..0000000 --- a/docs/dawn/features/r8unorm_storage.md +++ /dev/null
@@ -1,7 +0,0 @@ -# R8UnormStorage - -Adds the ability to read or write to r8unorm textures as storage for Graphite (but not both at the same time). - -Usage in WGSL requires the use of the `chromium_internal_graphite` enable. - -Note that in the future this will be merged in some form of storage texture support tier.
diff --git a/src/dawn/dawn.json b/src/dawn/dawn.json index 8f7d830..ea70974 100644 --- a/src/dawn/dawn.json +++ b/src/dawn/dawn.json
@@ -2394,45 +2394,44 @@ {"value": 20, "name": "adapter properties memory heaps", "tags": ["dawn"]}, {"value": 21, "name": "adapter properties D3D", "tags": ["dawn"]}, {"value": 22, "name": "adapter properties vk", "tags": ["dawn"]}, - {"value": 23, "name": "r8 unorm storage", "tags": ["dawn"]}, - {"value": 24, "name": "dawn format capabilities", "tags": ["dawn"]}, - {"value": 25, "name": "dawn drm format capabilities", "tags": ["dawn"]}, - {"value": 26, "name": "multi planar format nv16", "tags": ["dawn"]}, - {"value": 27, "name": "multi planar format nv24", "tags": ["dawn"]}, - {"value": 28, "name": "multi planar format p210", "tags": ["dawn"]}, - {"value": 29, "name": "multi planar format p410", "tags": ["dawn"]}, + {"value": 23, "name": "dawn format capabilities", "tags": ["dawn"]}, + {"value": 24, "name": "dawn drm format capabilities", "tags": ["dawn"]}, + {"value": 25, "name": "multi planar format nv16", "tags": ["dawn"]}, + {"value": 26, "name": "multi planar format nv24", "tags": ["dawn"]}, + {"value": 27, "name": "multi planar format p210", "tags": ["dawn"]}, + {"value": 28, "name": "multi planar format p410", "tags": ["dawn"]}, - {"value": 30, "name": "shared texture memory vk dedicated allocation", "tags": ["dawn", "native"]}, - {"value": 31, "name": "shared texture memory a hardware buffer", "tags": ["dawn", "native"]}, - {"value": 32, "name": "shared texture memory dma buf", "tags": ["dawn", "native"]}, - {"value": 33, "name": "shared texture memory opaque FD", "tags": ["dawn", "native"]}, - {"value": 34, "name": "shared texture memory zircon handle", "tags": ["dawn", "native"]}, - {"value": 35, "name": "shared texture memory DXGI shared handle", "tags": ["dawn", "native"]}, - {"value": 36, "name": "shared texture memory D3D11 texture 2D", "tags": ["dawn", "native"]}, - {"value": 37, "name": "shared texture memory IO surface", "tags": ["dawn", "native"]}, - {"value": 38, "name": "shared texture memory EGL image", "tags": ["dawn", "native"]}, - {"value": 39, "name": "shared fence vk semaphore opaque FD", "tags": ["dawn", "native"]}, - {"value": 40, "name": "shared fence sync FD", "tags": ["dawn", "native"]}, - {"value": 41, "name": "shared fence vk semaphore zircon handle", "tags": ["dawn", "native"]}, - {"value": 42, "name": "shared fence DXGI shared handle", "tags": ["dawn", "native"]}, - {"value": 43, "name": "shared fence MTL shared event", "tags": ["dawn", "native"]}, - {"value": 44, "name": "shared buffer memory D3D12 resource", "tags": ["dawn", "native"]}, - {"value": 45, "name": "static samplers", "tags": ["dawn"]}, - {"value": 46, "name": "y cb cr vulkan samplers", "tags": ["dawn"]}, - {"value": 47, "name": "shader module compilation options", "tags": ["dawn"]}, + {"value": 29, "name": "shared texture memory vk dedicated allocation", "tags": ["dawn", "native"]}, + {"value": 30, "name": "shared texture memory a hardware buffer", "tags": ["dawn", "native"]}, + {"value": 31, "name": "shared texture memory dma buf", "tags": ["dawn", "native"]}, + {"value": 32, "name": "shared texture memory opaque FD", "tags": ["dawn", "native"]}, + {"value": 33, "name": "shared texture memory zircon handle", "tags": ["dawn", "native"]}, + {"value": 34, "name": "shared texture memory DXGI shared handle", "tags": ["dawn", "native"]}, + {"value": 35, "name": "shared texture memory D3D11 texture 2D", "tags": ["dawn", "native"]}, + {"value": 36, "name": "shared texture memory IO surface", "tags": ["dawn", "native"]}, + {"value": 37, "name": "shared texture memory EGL image", "tags": ["dawn", "native"]}, + {"value": 38, "name": "shared fence vk semaphore opaque FD", "tags": ["dawn", "native"]}, + {"value": 39, "name": "shared fence sync FD", "tags": ["dawn", "native"]}, + {"value": 40, "name": "shared fence vk semaphore zircon handle", "tags": ["dawn", "native"]}, + {"value": 41, "name": "shared fence DXGI shared handle", "tags": ["dawn", "native"]}, + {"value": 42, "name": "shared fence MTL shared event", "tags": ["dawn", "native"]}, + {"value": 43, "name": "shared buffer memory D3D12 resource", "tags": ["dawn", "native"]}, + {"value": 44, "name": "static samplers", "tags": ["dawn"]}, + {"value": 45, "name": "y cb cr vulkan samplers", "tags": ["dawn"]}, + {"value": 46, "name": "shader module compilation options", "tags": ["dawn"]}, - {"value": 48, "name": "dawn load resolve texture", "tags": ["dawn"]}, - {"value": 49, "name": "dawn partial load resolve texture", "tags": ["dawn"]}, - {"value": 50, "name": "multi draw indirect", "tags": ["dawn", "emscripten"], "jsrepr": "'chromium-experimental-multi-draw-indirect'"}, - {"value": 51, "name": "dawn texel copy buffer row alignment", "tags": ["dawn"]}, - {"value": 52, "name": "flexible texture views", "tags": ["dawn"]}, - {"value": 53, "name": "chromium experimental subgroup matrix", "tags": ["dawn"]}, - {"value": 54, "name": "shared fence EGL sync", "tags": ["dawn", "native"]}, - {"value": 55, "name": "dawn device allocator control", "tags": ["dawn"]}, - {"value": 56, "name": "adapter properties WGPU", "tags": ["dawn"]}, - {"value": 57, "name": "shared buffer memory D3D12 shared memory file mapping handle", "tags": ["dawn"]}, - {"value": 58, "name": "shared texture memory D3D12 resource", "tags": ["dawn", "native"]}, - {"value": 59, "name": "chromium experimental sampling resource table", "tags": ["dawn"]} + {"value": 47, "name": "dawn load resolve texture", "tags": ["dawn"]}, + {"value": 48, "name": "dawn partial load resolve texture", "tags": ["dawn"]}, + {"value": 49, "name": "multi draw indirect", "tags": ["dawn", "emscripten"], "jsrepr": "'chromium-experimental-multi-draw-indirect'"}, + {"value": 50, "name": "dawn texel copy buffer row alignment", "tags": ["dawn"]}, + {"value": 51, "name": "flexible texture views", "tags": ["dawn"]}, + {"value": 52, "name": "chromium experimental subgroup matrix", "tags": ["dawn"]}, + {"value": 53, "name": "shared fence EGL sync", "tags": ["dawn", "native"]}, + {"value": 54, "name": "dawn device allocator control", "tags": ["dawn"]}, + {"value": 55, "name": "adapter properties WGPU", "tags": ["dawn"]}, + {"value": 56, "name": "shared buffer memory D3D12 shared memory file mapping handle", "tags": ["dawn"]}, + {"value": 57, "name": "shared texture memory D3D12 resource", "tags": ["dawn", "native"]}, + {"value": 58, "name": "chromium experimental sampling resource table", "tags": ["dawn"]} ] }, "filter mode": {
diff --git a/src/dawn/native/Features.cpp b/src/dawn/native/Features.cpp index 109ce9a..d2af44a 100644 --- a/src/dawn/native/Features.cpp +++ b/src/dawn/native/Features.cpp
@@ -323,11 +323,6 @@ {"Support importing ID3D12Resource as shared buffer memory.", "https://dawn.googlesource.com/dawn/+/refs/heads/main/docs/dawn/features/shared_buffer.md", FeatureInfo::FeatureState::Stable}}, - {Feature::R8UnormStorage, - {"Supports using r8unorm texture as storage texture.", - "https://dawn.googlesource.com/dawn/+/refs/heads/main/docs/dawn/features/" - "r8unorm_storage.md", - FeatureInfo::FeatureState::Experimental}}, {Feature::DawnFormatCapabilities, {"Supports querying the capabilities of a texture format.", "https://dawn.googlesource.com/dawn/+/refs/heads/main/docs/dawn/features/"
diff --git a/src/dawn/native/Format.cpp b/src/dawn/native/Format.cpp index 8ee77d5..3b85b02 100644 --- a/src/dawn/native/Format.cpp +++ b/src/dawn/native/Format.cpp
@@ -375,10 +375,6 @@ Cap::StorageRW); } - if (device->HasFeature(Feature::R8UnormStorage)) { - AddCaps({wgpu::TextureFormat::R8Unorm}, Cap::StorageROnly | Cap::StorageWOnly); - } - if (device->HasFeature(Feature::BGRA8UnormStorage)) { AddCaps({wgpu::TextureFormat::BGRA8Unorm}, Cap::StorageWOnly); }
diff --git a/src/dawn/native/d3d11/PhysicalDeviceD3D11.cpp b/src/dawn/native/d3d11/PhysicalDeviceD3D11.cpp index 63d1db4..214c512 100644 --- a/src/dawn/native/d3d11/PhysicalDeviceD3D11.cpp +++ b/src/dawn/native/d3d11/PhysicalDeviceD3D11.cpp
@@ -155,7 +155,6 @@ EnableFeature(Feature::Unorm16TextureFormats); EnableFeature(Feature::AdapterPropertiesMemoryHeaps); EnableFeature(Feature::AdapterPropertiesD3D); - EnableFeature(Feature::R8UnormStorage); EnableFeature(Feature::ShaderModuleCompilationOptions); EnableFeature(Feature::DawnLoadResolveTexture); EnableFeature(Feature::DawnPartialLoadResolveTexture);
diff --git a/src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp b/src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp index 1a6e269..27c38f9 100644 --- a/src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp +++ b/src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp
@@ -168,7 +168,6 @@ EnableFeature(Feature::AdapterPropertiesMemoryHeaps); EnableFeature(Feature::AdapterPropertiesD3D); EnableFeature(Feature::MultiPlanarRenderTargets); - EnableFeature(Feature::R8UnormStorage); EnableFeature(Feature::SharedBufferMemoryD3D12Resource); EnableFeature(Feature::ShaderModuleCompilationOptions); EnableFeature(Feature::StaticSamplers);
diff --git a/src/dawn/native/metal/PhysicalDeviceMTL.mm b/src/dawn/native/metal/PhysicalDeviceMTL.mm index e889c7f..832b570 100644 --- a/src/dawn/native/metal/PhysicalDeviceMTL.mm +++ b/src/dawn/native/metal/PhysicalDeviceMTL.mm
@@ -697,7 +697,6 @@ EnableFeature(Feature::RG11B10UfloatRenderable); EnableFeature(Feature::BGRA8UnormStorage); EnableFeature(Feature::DualSourceBlending); - EnableFeature(Feature::R8UnormStorage); EnableFeature(Feature::ShaderModuleCompilationOptions); EnableFeature(Feature::DawnLoadResolveTexture); EnableFeature(Feature::ClipDistances);
diff --git a/src/dawn/native/vulkan/DeviceVk.cpp b/src/dawn/native/vulkan/DeviceVk.cpp index ceb03d1..681aaab 100644 --- a/src/dawn/native/vulkan/DeviceVk.cpp +++ b/src/dawn/native/vulkan/DeviceVk.cpp
@@ -606,7 +606,7 @@ usedKnobs.features.shaderClipDistance = VK_TRUE; } - if (HasFeature(Feature::R8UnormStorage) || HasFeature(Feature::TextureFormatsTier1)) { + if (HasFeature(Feature::TextureFormatsTier1)) { usedKnobs.features.shaderStorageImageExtendedFormats = VK_TRUE; }
diff --git a/src/dawn/native/vulkan/PhysicalDeviceVk.cpp b/src/dawn/native/vulkan/PhysicalDeviceVk.cpp index cb64d75..8c6d1bd 100644 --- a/src/dawn/native/vulkan/PhysicalDeviceVk.cpp +++ b/src/dawn/native/vulkan/PhysicalDeviceVk.cpp
@@ -325,10 +325,6 @@ EnableFeature(Feature::DualSourceBlending); } - if (mDeviceInfo.features.shaderStorageImageExtendedFormats == VK_TRUE) { - EnableFeature(Feature::R8UnormStorage); - } - if (mDeviceInfo.features.shaderClipDistance == VK_TRUE) { EnableFeature(Feature::ClipDistances); }
diff --git a/src/dawn/node/binding/Converter.cpp b/src/dawn/node/binding/Converter.cpp index 753e98f..68bbd13 100644 --- a/src/dawn/node/binding/Converter.cpp +++ b/src/dawn/node/binding/Converter.cpp
@@ -1729,7 +1729,6 @@ case wgpu::FeatureName::Unorm16TextureFormats: case wgpu::FeatureName::PixelLocalStorageCoherent: case wgpu::FeatureName::PixelLocalStorageNonCoherent: - case wgpu::FeatureName::R8UnormStorage: case wgpu::FeatureName::ShaderModuleCompilationOptions: case wgpu::FeatureName::SharedBufferMemoryD3D12Resource: case wgpu::FeatureName::SharedFenceDXGISharedHandle:
diff --git a/src/dawn/tests/end2end/ArchTierLimitsExhaustive.cpp b/src/dawn/tests/end2end/ArchTierLimitsExhaustive.cpp index 57c843a..76ccea3 100644 --- a/src/dawn/tests/end2end/ArchTierLimitsExhaustive.cpp +++ b/src/dawn/tests/end2end/ArchTierLimitsExhaustive.cpp
@@ -357,7 +357,6 @@ AdapterPropertiesMemoryHeaps, AdapterPropertiesD3D, AdapterPropertiesVk, - R8UnormStorage, DawnFormatCapabilities, DawnDrmFormatCapabilities, MultiPlanarFormatNv16, @@ -422,62 +421,62 @@ // clang-format off { // AMD -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "Metal_AMD_Radeon_Pro_5300M"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "Metal_AMD_Radeon_Pro_555X"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "Metal_AMD_Radeon_Pro_560X"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "Metal_AMD_Radeon_Pro_5300M"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "Metal_AMD_Radeon_Pro_555X"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "Metal_AMD_Radeon_Pro_560X"); // Apple -AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, "Metal_Apple_M2"); +AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, "Metal_Apple_M2"); // ARM // Intel -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Intel_R__UHD_Graphics_630"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_630"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_630"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "Metal_Intel_R__UHD_Graphics_630"); -AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Intel__Intel_R__UHD_Graphics_630__0x00009BC5__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_101_2127__compat"); -AddDevice({1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__UHD_Graphics_630"); -AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__UHD_Graphics_630__CML_GT2"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Intel_R__UHD_Graphics_770"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Intel_R__UHD_Graphics_770"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_770"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_770"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_770"); -AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Intel__Intel_R__UHD_Graphics_770__0x00004680__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_101_5333__compat"); -AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Intel__Intel_R__UHD_Graphics_770__0x00004680__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_101_5333__compat"); -AddDevice({1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__UHD_Graphics_770"); -AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__UHD_Graphics_770__ADL_S_GT1"); -AddDevice({1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__Iris_R__Xe_Graphics__TGL_GT2"); -AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__Iris_R__Xe_Graphics__TGL_GT2"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Intel_R__UHD_Graphics_630"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_630"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_630"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "Metal_Intel_R__UHD_Graphics_630"); +AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Intel__Intel_R__UHD_Graphics_630__0x00009BC5__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_101_2127__compat"); +AddDevice({1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__UHD_Graphics_630"); +AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__UHD_Graphics_630__CML_GT2"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Intel_R__UHD_Graphics_770"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Intel_R__UHD_Graphics_770"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_770"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_770"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Intel_R__UHD_Graphics_770"); +AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Intel__Intel_R__UHD_Graphics_770__0x00004680__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_101_5333__compat"); +AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Intel__Intel_R__UHD_Graphics_770__0x00004680__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_101_5333__compat"); +AddDevice({1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__UHD_Graphics_770"); +AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__UHD_Graphics_770__ADL_S_GT1"); +AddDevice({1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__Iris_R__Xe_Graphics__TGL_GT2"); +AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Intel_R__Iris_R__Xe_Graphics__TGL_GT2"); // llvmpipe -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_llvmpipe__LLVM_19_1_7__256_bits"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_llvmpipe__LLVM_19_1_7__256_bits"); // Microsoft -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Microsoft_Basic_Render_Driver_Integrated_GPU"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Microsoft_Basic_Render_Driver_Integrated_GPU"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Microsoft_Basic_Render_Driver_Integrated_GPU"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Microsoft_Basic_Render_Driver_Integrated_GPU"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Microsoft_Basic_Render_Driver_Integrated_GPU"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0}, "D3D12_Microsoft_Basic_Render_Driver_Integrated_GPU"); // NVIDIA -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_NVIDIA_GeForce_GTX_1660"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0}, "D3D12_NVIDIA_GeForce_GTX_1660"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0}, "D3D12_NVIDIA_GeForce_GTX_1660"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_GeForce_GTX_1660"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_GeForce_GTX_1660"); -AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__NVIDIA__NVIDIA_GeForce_GTX_1660__0x00002184__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_15_4601__compat"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_NVIDIA_GeForce_GTX_1660"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_NVIDIA_GeForce_GTX_1660"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_NVIDIA_GeForce_GTX_1660"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_NVIDIA_GeForce_GTX_1660"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0}, "D3D12_NVIDIA_GeForce_GTX_1660"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0}, "D3D12_NVIDIA_GeForce_GTX_1660"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_GeForce_GTX_1660"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_GeForce_GTX_1660"); +AddDevice({0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__NVIDIA__NVIDIA_GeForce_GTX_1660__0x00002184__Direct3D11_vs_5_0_ps_5_0__D3D11_31_0_15_4601__compat"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_NVIDIA_GeForce_GTX_1660"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_NVIDIA_GeForce_GTX_1660"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_NVIDIA_GeForce_GTX_1660"); // Qualcomm -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Qualcomm_R__Adreno_TM__X1_85_GPU"); -AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D12_Qualcomm_R__Adreno_TM__X1_85_GPU"); -AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Qualcomm_R__Adreno_TM__X1_85_GPU"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D11_Qualcomm_R__Adreno_TM__X1_85_GPU"); +AddDevice({1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0}, "D3D12_Qualcomm_R__Adreno_TM__X1_85_GPU"); +AddDevice({1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1}, "Vulkan_Qualcomm_R__Adreno_TM__X1_85_GPU"); // SwiftShader -AddDevice({0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Google__Vulkan_1_3_0__SwiftShader_Device__Subzero___0x0000C0DE____SwiftShader_driver_5_0_0__compat"); -AddDevice({0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Google__Vulkan_1_3_0__SwiftShader_Device__Subzero___0x0000C0DE____SwiftShader_driver_5_0_0__compat"); +AddDevice({0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Google__Vulkan_1_3_0__SwiftShader_Device__Subzero___0x0000C0DE____SwiftShader_driver_5_0_0__compat"); +AddDevice({0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0}, "OpenGLES_ANGLE__Google__Vulkan_1_3_0__SwiftShader_Device__Subzero___0x0000C0DE____SwiftShader_driver_5_0_0__compat"); } // clang-format on
diff --git a/src/dawn/tests/end2end/StorageTextureTests.cpp b/src/dawn/tests/end2end/StorageTextureTests.cpp index dbdb347..46b5081 100644 --- a/src/dawn/tests/end2end/StorageTextureTests.cpp +++ b/src/dawn/tests/end2end/StorageTextureTests.cpp
@@ -1183,72 +1183,6 @@ VulkanBackend(), WebGPUBackend()); -class R8UnormStorageTextureTests : public StorageTextureTests { - public: - std::vector<wgpu::FeatureName> GetRequiredFeatures() override { - if (SupportsFeatures({wgpu::FeatureName::R8UnormStorage})) { - mIsR8UnormStorageSupported = true; - return {wgpu::FeatureName::R8UnormStorage}; - } else { - mIsR8UnormStorageSupported = false; - return {}; - } - } - - bool IsR8UnormStorageSupported() { return mIsR8UnormStorageSupported; } - - private: - bool mIsR8UnormStorageSupported = false; -}; - -// Test that R8Unorm is supported to be used as storage texture in compute shaders when the -// optional feature 'r8unorm-storage' is supported. -TEST_P(R8UnormStorageTextureTests, WriteonlyStorageTextureInComputeShader) { - DAWN_TEST_UNSUPPORTED_IF(!IsR8UnormStorageSupported()); - - constexpr wgpu::TextureFormat kFormat = wgpu::TextureFormat::R8Unorm; - wgpu::Texture writeonlyStorageTexture = - CreateTexture(kFormat, wgpu::TextureUsage::StorageBinding | wgpu::TextureUsage::CopySrc, - {kWidth, kHeight}); - - // Write the expected pixel values into the write-only storage texture. - const std::string computeShader = CommonWriteOnlyTestCode("compute", kFormat); - WriteIntoStorageTextureInComputePass(writeonlyStorageTexture, computeShader.c_str()); - - // Verify the pixel data in the write-only storage texture is expected. - CheckOutputStorageTexture(writeonlyStorageTexture, kFormat, {kWidth, kHeight}); -} - -// Test that R8Unorm is supported to be used as storage texture in fragment shaders when the -// optional feature 'r8unorm-storage' is supported. -TEST_P(R8UnormStorageTextureTests, WriteonlyStorageTextureInFragmentShader) { - DAWN_TEST_UNSUPPORTED_IF(!IsR8UnormStorageSupported()); - - constexpr wgpu::TextureFormat kFormat = wgpu::TextureFormat::R8Unorm; - - // Prepare the write-only storage texture. - wgpu::Texture writeonlyStorageTexture = - CreateTexture(kFormat, wgpu::TextureUsage::StorageBinding | wgpu::TextureUsage::CopySrc, - {kWidth, kHeight}); - - // Write the expected pixel values into the write-only storage texture. - const std::string fragmentShader = CommonWriteOnlyTestCode("fragment", kFormat); - WriteIntoStorageTextureInRenderPass(writeonlyStorageTexture, kSimpleVertexShader, - fragmentShader.c_str()); - - // Verify the pixel data in the write-only storage texture is expected. - CheckOutputStorageTexture(writeonlyStorageTexture, kFormat, {kWidth, kHeight}); -} - -DAWN_INSTANTIATE_TEST(R8UnormStorageTextureTests, - D3D11Backend(), - D3D12Backend(), - MetalBackend(), - OpenGLBackend(), - OpenGLESBackend(), - VulkanBackend(), - WebGPUBackend()); - class StorageTextureZeroInitTests : public StorageTextureTests { public: static std::vector<uint8_t> GetExpectedData() {
diff --git a/src/dawn/tests/unittests/ITypBitsetTests.cpp b/src/dawn/tests/unittests/ITypBitsetTests.cpp index 52dbe3a..b7af43d 100644 --- a/src/dawn/tests/unittests/ITypBitsetTests.cpp +++ b/src/dawn/tests/unittests/ITypBitsetTests.cpp
@@ -325,7 +325,7 @@ std::set<native::Feature> originalValues; originalValues.insert(native::Feature::Depth32FloatStencil8); originalValues.insert(native::Feature::Subgroups); - originalValues.insert(native::Feature::R8UnormStorage); + originalValues.insert(native::Feature::TextureFormatsTier1); originalValues.insert(native::Feature::MultiDrawIndirect); for (native::Feature value : originalValues) { @@ -359,7 +359,7 @@ mLargeStateBits.set(native::Feature::Depth32FloatStencil8); mLargeStateBits.set(native::Feature::Subgroups); - mLargeStateBits.set(native::Feature::R8UnormStorage); + mLargeStateBits.set(native::Feature::TextureFormatsTier1); mLargeStateBits.set(native::Feature::MultiDrawIndirect); otherBits.set(native::Feature::ShaderF16);
diff --git a/src/dawn/tests/unittests/validation/StorageTextureValidationTests.cpp b/src/dawn/tests/unittests/validation/StorageTextureValidationTests.cpp index a8c331b..ba12f97 100644 --- a/src/dawn/tests/unittests/validation/StorageTextureValidationTests.cpp +++ b/src/dawn/tests/unittests/validation/StorageTextureValidationTests.cpp
@@ -1184,86 +1184,6 @@ } } -class R8UnormStorageValidationTests : public StorageTextureValidationTests { - std::vector<wgpu::FeatureName> GetRequiredFeatures() override { - return {wgpu::FeatureName::R8UnormStorage}; - } -}; - -// Check that it is allowed to create an R8Unorm texture with the storage usage. -TEST_F(R8UnormStorageValidationTests, TextureCreation) { - wgpu::TextureDescriptor desc; - desc.format = wgpu::TextureFormat::R8Unorm; - desc.usage = wgpu::TextureUsage::StorageBinding; - desc.size = {1, 1}; - device.CreateTexture(&desc); -} - -// Check that it is allowed to create a BGL with a read-only or write-only R8unorm storage texture -// entry. -TEST_F(R8UnormStorageValidationTests, BGLEntry) { - // Control case: read-only or write-only are allowed. - utils::MakeBindGroupLayout( - device, {{0, wgpu::ShaderStage::Fragment, wgpu::StorageTextureAccess::ReadOnly, - wgpu::TextureFormat::R8Unorm}}); - utils::MakeBindGroupLayout( - device, {{0, wgpu::ShaderStage::Fragment, wgpu::StorageTextureAccess::WriteOnly, - wgpu::TextureFormat::R8Unorm}}); - - // Error cases: read-write is disallowed. - ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout( - device, {{0, wgpu::ShaderStage::Fragment, wgpu::StorageTextureAccess::ReadWrite, - wgpu::TextureFormat::R8Unorm}})); -} - -// Check that using the `r8unorm` to create a WGSL compute shader is allowed. -TEST_F(R8UnormStorageValidationTests, ShaderModule) { - utils::CreateShaderModule(device, R"( - enable chromium_internal_graphite; - @group(0) @binding(0) var t : texture_storage_2d<r8unorm, write>; - )"); -} - -// Check that using an r8unorm storage texture read-only or write-only with implicit layout is -// valid. -TEST_F(R8UnormStorageValidationTests, End2endUsage) { - wgpu::ComputePipelineDescriptor cDesc; - cDesc.compute.module = utils::CreateShaderModule(device, R"( - enable chromium_internal_graphite; - @group(0) @binding(0) var input : texture_storage_2d<r8unorm, read>; - @group(0) @binding(1) var output : texture_storage_2d<r8unorm, write>; - - @workgroup_size(4, 4) @compute fn main(@builtin(local_invocation_id) id : vec3<u32>) { - textureStore(output, id.xy, 2 * textureLoad(input, id.xy)); - } - )"); - wgpu::ComputePipeline pipeline = device.CreateComputePipeline(&cDesc); - - wgpu::TextureDescriptor tDesc; - tDesc.format = wgpu::TextureFormat::R8Unorm; - tDesc.usage = wgpu::TextureUsage::StorageBinding | wgpu::TextureUsage::CopySrc | - wgpu::TextureUsage::CopyDst; - tDesc.size = {4, 4}; - wgpu::Texture input = device.CreateTexture(&tDesc); - wgpu::Texture output = device.CreateTexture(&tDesc); - - wgpu::BindGroup bg = utils::MakeBindGroup(device, pipeline.GetBindGroupLayout(0), - { - {0, input.CreateView()}, - {1, output.CreateView()}, - }); - - wgpu::CommandEncoder encoder = device.CreateCommandEncoder(); - wgpu::ComputePassEncoder pass = encoder.BeginComputePass(); - pass.SetPipeline(pipeline); - pass.SetBindGroup(0, bg); - pass.DispatchWorkgroups(1); - pass.End(); - - wgpu::CommandBuffer commands = encoder.Finish(); - device.GetQueue().Submit(1, &commands); -} - // Check that it is not allowed to create a kTier1AdditionalStorageFormats format // texture with the storage usage. TEST_F(StorageTextureValidationTests, TextureCreationWithoutFeature) {
diff --git a/src/dawn/wire/SupportedFeatures.cpp b/src/dawn/wire/SupportedFeatures.cpp index 049fa6e..50eaa6f 100644 --- a/src/dawn/wire/SupportedFeatures.cpp +++ b/src/dawn/wire/SupportedFeatures.cpp
@@ -105,7 +105,6 @@ case WGPUFeatureName_AdapterPropertiesMemoryHeaps: case WGPUFeatureName_AdapterPropertiesD3D: case WGPUFeatureName_AdapterPropertiesVk: - case WGPUFeatureName_R8UnormStorage: case WGPUFeatureName_StaticSamplers: case WGPUFeatureName_YCbCrVulkanSamplers: case WGPUFeatureName_ShaderModuleCompilationOptions: