Skip to content

Commit a71d9dc

Browse files
KangzDawn LUCI CQ
Kangz
authored and
Dawn LUCI CQ
committed
[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>
1 parent e3231b9 commit a71d9dc

File tree

15 files changed

+79
-252
lines changed

15 files changed

+79
-252
lines changed

‎docs/dawn/features/r8unorm_storage.md‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/dawn/dawn.json‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2394,45 +2394,44 @@
23942394
{"value": 20, "name": "adapter properties memory heaps", "tags": ["dawn"]},
23952395
{"value": 21, "name": "adapter properties D3D", "tags": ["dawn"]},
23962396
{"value": 22, "name": "adapter properties vk", "tags": ["dawn"]},
2397-
{"value": 23, "name": "r8 unorm storage", "tags": ["dawn"]},
2398-
{"value": 24, "name": "dawn format capabilities", "tags": ["dawn"]},
2399-
{"value": 25, "name": "dawn drm format capabilities", "tags": ["dawn"]},
2400-
{"value": 26, "name": "multi planar format nv16", "tags": ["dawn"]},
2401-
{"value": 27, "name": "multi planar format nv24", "tags": ["dawn"]},
2402-
{"value": 28, "name": "multi planar format p210", "tags": ["dawn"]},
2403-
{"value": 29, "name": "multi planar format p410", "tags": ["dawn"]},
2397+
{"value": 23, "name": "dawn format capabilities", "tags": ["dawn"]},
2398+
{"value": 24, "name": "dawn drm format capabilities", "tags": ["dawn"]},
2399+
{"value": 25, "name": "multi planar format nv16", "tags": ["dawn"]},
2400+
{"value": 26, "name": "multi planar format nv24", "tags": ["dawn"]},
2401+
{"value": 27, "name": "multi planar format p210", "tags": ["dawn"]},
2402+
{"value": 28, "name": "multi planar format p410", "tags": ["dawn"]},
24042403

2405-
{"value": 30, "name": "shared texture memory vk dedicated allocation", "tags": ["dawn", "native"]},
2406-
{"value": 31, "name": "shared texture memory a hardware buffer", "tags": ["dawn", "native"]},
2407-
{"value": 32, "name": "shared texture memory dma buf", "tags": ["dawn", "native"]},
2408-
{"value": 33, "name": "shared texture memory opaque FD", "tags": ["dawn", "native"]},
2409-
{"value": 34, "name": "shared texture memory zircon handle", "tags": ["dawn", "native"]},
2410-
{"value": 35, "name": "shared texture memory DXGI shared handle", "tags": ["dawn", "native"]},
2411-
{"value": 36, "name": "shared texture memory D3D11 texture 2D", "tags": ["dawn", "native"]},
2412-
{"value": 37, "name": "shared texture memory IO surface", "tags": ["dawn", "native"]},
2413-
{"value": 38, "name": "shared texture memory EGL image", "tags": ["dawn", "native"]},
2414-
{"value": 39, "name": "shared fence vk semaphore opaque FD", "tags": ["dawn", "native"]},
2415-
{"value": 40, "name": "shared fence sync FD", "tags": ["dawn", "native"]},
2416-
{"value": 41, "name": "shared fence vk semaphore zircon handle", "tags": ["dawn", "native"]},
2417-
{"value": 42, "name": "shared fence DXGI shared handle", "tags": ["dawn", "native"]},
2418-
{"value": 43, "name": "shared fence MTL shared event", "tags": ["dawn", "native"]},
2419-
{"value": 44, "name": "shared buffer memory D3D12 resource", "tags": ["dawn", "native"]},
2420-
{"value": 45, "name": "static samplers", "tags": ["dawn"]},
2421-
{"value": 46, "name": "y cb cr vulkan samplers", "tags": ["dawn"]},
2422-
{"value": 47, "name": "shader module compilation options", "tags": ["dawn"]},
2404+
{"value": 29, "name": "shared texture memory vk dedicated allocation", "tags": ["dawn", "native"]},
2405+
{"value": 30, "name": "shared texture memory a hardware buffer", "tags": ["dawn", "native"]},
2406+
{"value": 31, "name": "shared texture memory dma buf", "tags": ["dawn", "native"]},
2407+
{"value": 32, "name": "shared texture memory opaque FD", "tags": ["dawn", "native"]},
2408+
{"value": 33, "name": "shared texture memory zircon handle", "tags": ["dawn", "native"]},
2409+
{"value": 34, "name": "shared texture memory DXGI shared handle", "tags": ["dawn", "native"]},
2410+
{"value": 35, "name": "shared texture memory D3D11 texture 2D", "tags": ["dawn", "native"]},
2411+
{"value": 36, "name": "shared texture memory IO surface", "tags": ["dawn", "native"]},
2412+
{"value": 37, "name": "shared texture memory EGL image", "tags": ["dawn", "native"]},
2413+
{"value": 38, "name": "shared fence vk semaphore opaque FD", "tags": ["dawn", "native"]},
2414+
{"value": 39, "name": "shared fence sync FD", "tags": ["dawn", "native"]},
2415+
{"value": 40, "name": "shared fence vk semaphore zircon handle", "tags": ["dawn", "native"]},
2416+
{"value": 41, "name": "shared fence DXGI shared handle", "tags": ["dawn", "native"]},
2417+
{"value": 42, "name": "shared fence MTL shared event", "tags": ["dawn", "native"]},
2418+
{"value": 43, "name": "shared buffer memory D3D12 resource", "tags": ["dawn", "native"]},
2419+
{"value": 44, "name": "static samplers", "tags": ["dawn"]},
2420+
{"value": 45, "name": "y cb cr vulkan samplers", "tags": ["dawn"]},
2421+
{"value": 46, "name": "shader module compilation options", "tags": ["dawn"]},
24232422

2424-
{"value": 48, "name": "dawn load resolve texture", "tags": ["dawn"]},
2425-
{"value": 49, "name": "dawn partial load resolve texture", "tags": ["dawn"]},
2426-
{"value": 50, "name": "multi draw indirect", "tags": ["dawn", "emscripten"], "jsrepr": "'chromium-experimental-multi-draw-indirect'"},
2427-
{"value": 51, "name": "dawn texel copy buffer row alignment", "tags": ["dawn"]},
2428-
{"value": 52, "name": "flexible texture views", "tags": ["dawn"]},
2429-
{"value": 53, "name": "chromium experimental subgroup matrix", "tags": ["dawn"]},
2430-
{"value": 54, "name": "shared fence EGL sync", "tags": ["dawn", "native"]},
2431-
{"value": 55, "name": "dawn device allocator control", "tags": ["dawn"]},
2432-
{"value": 56, "name": "adapter properties WGPU", "tags": ["dawn"]},
2433-
{"value": 57, "name": "shared buffer memory D3D12 shared memory file mapping handle", "tags": ["dawn"]},
2434-
{"value": 58, "name": "shared texture memory D3D12 resource", "tags": ["dawn", "native"]},
2435-
{"value": 59, "name": "chromium experimental sampling resource table", "tags": ["dawn"]}
2423+
{"value": 47, "name": "dawn load resolve texture", "tags": ["dawn"]},
2424+
{"value": 48, "name": "dawn partial load resolve texture", "tags": ["dawn"]},
2425+
{"value": 49, "name": "multi draw indirect", "tags": ["dawn", "emscripten"], "jsrepr": "'chromium-experimental-multi-draw-indirect'"},
2426+
{"value": 50, "name": "dawn texel copy buffer row alignment", "tags": ["dawn"]},
2427+
{"value": 51, "name": "flexible texture views", "tags": ["dawn"]},
2428+
{"value": 52, "name": "chromium experimental subgroup matrix", "tags": ["dawn"]},
2429+
{"value": 53, "name": "shared fence EGL sync", "tags": ["dawn", "native"]},
2430+
{"value": 54, "name": "dawn device allocator control", "tags": ["dawn"]},
2431+
{"value": 55, "name": "adapter properties WGPU", "tags": ["dawn"]},
2432+
{"value": 56, "name": "shared buffer memory D3D12 shared memory file mapping handle", "tags": ["dawn"]},
2433+
{"value": 57, "name": "shared texture memory D3D12 resource", "tags": ["dawn", "native"]},
2434+
{"value": 58, "name": "chromium experimental sampling resource table", "tags": ["dawn"]}
24362435
]
24372436
},
24382437
"filter mode": {

‎src/dawn/native/Features.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,6 @@ static constexpr FeatureEnumAndInfo kFeatureInfo[] = {
323323
{"Support importing ID3D12Resource as shared buffer memory.",
324324
"https://dawn.googlesource.com/dawn/+/refs/heads/main/docs/dawn/features/shared_buffer.md",
325325
FeatureInfo::FeatureState::Stable}},
326-
{Feature::R8UnormStorage,
327-
{"Supports using r8unorm texture as storage texture.",
328-
"https://dawn.googlesource.com/dawn/+/refs/heads/main/docs/dawn/features/"
329-
"r8unorm_storage.md",
330-
FeatureInfo::FeatureState::Experimental}},
331326
{Feature::DawnFormatCapabilities,
332327
{"Supports querying the capabilities of a texture format.",
333328
"https://dawn.googlesource.com/dawn/+/refs/heads/main/docs/dawn/features/"

‎src/dawn/native/Format.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,6 @@ void ComputeFormatCapabilities(const DeviceBase* device, FormatTable& table) {
375375
Cap::StorageRW);
376376
}
377377

378-
if (device->HasFeature(Feature::R8UnormStorage)) {
379-
AddCaps({wgpu::TextureFormat::R8Unorm}, Cap::StorageROnly | Cap::StorageWOnly);
380-
}
381-
382378
if (device->HasFeature(Feature::BGRA8UnormStorage)) {
383379
AddCaps({wgpu::TextureFormat::BGRA8Unorm}, Cap::StorageWOnly);
384380
}

‎src/dawn/native/d3d11/PhysicalDeviceD3D11.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ void PhysicalDevice::InitializeSupportedFeaturesImpl() {
155155
EnableFeature(Feature::Unorm16TextureFormats);
156156
EnableFeature(Feature::AdapterPropertiesMemoryHeaps);
157157
EnableFeature(Feature::AdapterPropertiesD3D);
158-
EnableFeature(Feature::R8UnormStorage);
159158
EnableFeature(Feature::ShaderModuleCompilationOptions);
160159
EnableFeature(Feature::DawnLoadResolveTexture);
161160
EnableFeature(Feature::DawnPartialLoadResolveTexture);

‎src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ void PhysicalDevice::InitializeSupportedFeaturesImpl() {
168168
EnableFeature(Feature::AdapterPropertiesMemoryHeaps);
169169
EnableFeature(Feature::AdapterPropertiesD3D);
170170
EnableFeature(Feature::MultiPlanarRenderTargets);
171-
EnableFeature(Feature::R8UnormStorage);
172171
EnableFeature(Feature::SharedBufferMemoryD3D12Resource);
173172
EnableFeature(Feature::ShaderModuleCompilationOptions);
174173
EnableFeature(Feature::StaticSamplers);

‎src/dawn/native/metal/PhysicalDeviceMTL.mm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,6 @@ bool IsGPUCounterSupported(id<MTLDevice> device,
697697
EnableFeature(Feature::RG11B10UfloatRenderable);
698698
EnableFeature(Feature::BGRA8UnormStorage);
699699
EnableFeature(Feature::DualSourceBlending);
700-
EnableFeature(Feature::R8UnormStorage);
701700
EnableFeature(Feature::ShaderModuleCompilationOptions);
702701
EnableFeature(Feature::DawnLoadResolveTexture);
703702
EnableFeature(Feature::ClipDistances);

‎src/dawn/native/vulkan/DeviceVk.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ ResultOrError<VulkanDeviceKnobs> Device::CreateDevice(VkPhysicalDevice vkPhysica
606606
usedKnobs.features.shaderClipDistance = VK_TRUE;
607607
}
608608

609-
if (HasFeature(Feature::R8UnormStorage) || HasFeature(Feature::TextureFormatsTier1)) {
609+
if (HasFeature(Feature::TextureFormatsTier1)) {
610610
usedKnobs.features.shaderStorageImageExtendedFormats = VK_TRUE;
611611
}
612612

‎src/dawn/native/vulkan/PhysicalDeviceVk.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,6 @@ void PhysicalDevice::InitializeSupportedFeaturesImpl() {
325325
EnableFeature(Feature::DualSourceBlending);
326326
}
327327

328-
if (mDeviceInfo.features.shaderStorageImageExtendedFormats == VK_TRUE) {
329-
EnableFeature(Feature::R8UnormStorage);
330-
}
331-
332328
if (mDeviceInfo.features.shaderClipDistance == VK_TRUE) {
333329
EnableFeature(Feature::ClipDistances);
334330
}

‎src/dawn/node/binding/Converter.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,6 @@ bool Converter::Convert(interop::GPUFeatureName& out, wgpu::FeatureName in) {
17291729
case wgpu::FeatureName::Unorm16TextureFormats:
17301730
case wgpu::FeatureName::PixelLocalStorageCoherent:
17311731
case wgpu::FeatureName::PixelLocalStorageNonCoherent:
1732-
case wgpu::FeatureName::R8UnormStorage:
17331732
case wgpu::FeatureName::ShaderModuleCompilationOptions:
17341733
case wgpu::FeatureName::SharedBufferMemoryD3D12Resource:
17351734
case wgpu::FeatureName::SharedFenceDXGISharedHandle:

0 commit comments

Comments
 (0)