Enable RENDER_ATTACHMENT for R8Snorm, RG8Snorm, and RGBA8Snorm formats
Add support for RENDER_ATTACHMENT capability on R8Snorm/RG8Snorm/RGBA8Snorm texture formats,
conditional on the texture-formats-tier1 feature being enabled.
Bug: 421941589
Change-Id: Idaf7354d83108321d9164d42df6836025e638874
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/245394
Reviewed-by: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Loko Kung <lokokung@google.com>
Commit-Queue: Shanxing Mei <shanxing.mei@intel.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/dawn/dawn.json b/src/dawn/dawn.json
index e67b519..e61220d 100644
--- a/src/dawn/dawn.json
+++ b/src/dawn/dawn.json
@@ -2321,7 +2321,8 @@
{"value": 54, "name": "flexible texture views", "tags": ["dawn"]},
{"value": 55, "name": "chromium experimental subgroup matrix", "tags": ["dawn"]},
{"value": 56, "name": "shared fence EGL sync", "tags": ["dawn", "native"]},
- {"value": 57, "name": "dawn device allocator control", "tags": ["dawn"]}
+ {"value": 57, "name": "dawn device allocator control", "tags": ["dawn"]},
+ {"value": 58, "name": "texture formats tier1", "tags": ["dawn"]}
]
},
"filter mode": {
diff --git a/src/dawn/native/Features.cpp b/src/dawn/native/Features.cpp
index efa7ea8..b04eb0e 100644
--- a/src/dawn/native/Features.cpp
+++ b/src/dawn/native/Features.cpp
@@ -380,6 +380,12 @@
{"Supports the \"enable subgroups;\" directive in WGSL.",
"https://github.com/gpuweb/gpuweb/blob/main/proposals/subgroups.md",
FeatureInfo::FeatureState::Stable}},
+ {Feature::TextureFormatsTier1,
+ {"Supports some new GPUTextureFormats with the RENDER_ATTACHMENT, blendable, multisampling "
+ "capabilities and the STORAGE_BINDING capability with the 'read-only' and 'write-only'"
+ "GPUStorageTextureAccesses ",
+ "https://gpuweb.github.io/gpuweb/#texture-formats-tier1",
+ FeatureInfo::FeatureState::Experimental}},
{Feature::CoreFeaturesAndLimits,
{"Lifts all compatibility mode restrictions (features and limits) to core when enabled on a "
"device.",
diff --git a/src/dawn/native/Format.cpp b/src/dawn/native/Format.cpp
index a130d6d..2b1ab68 100644
--- a/src/dawn/native/Format.cpp
+++ b/src/dawn/native/Format.cpp
@@ -497,17 +497,19 @@
// clang-format off
// 1 byte color formats
auto r8unormSupportsStorage = device->HasFeature(Feature::R8UnormStorage) ? Cap::StorageROrW : Cap::None;
+ auto r8snormSupportsRender = device->HasFeature(Feature::TextureFormatsTier1) ? Cap::Renderable : Cap::None;
AddColorFormat(wgpu::TextureFormat::R8Unorm, Cap::Renderable | Cap::Multisample | Cap::Resolve | r8unormSupportsStorage | Cap::Blendable, ByteSize(1), kAnyFloat, ComponentCount(1), RenderTargetPixelByteCost(1), RenderTargetComponentAlignment(1));
- AddColorFormat(wgpu::TextureFormat::R8Snorm, Cap::None, ByteSize(1), kAnyFloat, ComponentCount(1));
+ AddColorFormat(wgpu::TextureFormat::R8Snorm, r8snormSupportsRender, ByteSize(1), kAnyFloat, ComponentCount(1),RenderTargetPixelByteCost(1), RenderTargetComponentAlignment(1));
AddColorFormat(wgpu::TextureFormat::R8Uint, Cap::Renderable | intMultisampleCaps, ByteSize(1), SampleTypeBit::Uint, ComponentCount(1), RenderTargetPixelByteCost(1), RenderTargetComponentAlignment(1));
AddColorFormat(wgpu::TextureFormat::R8Sint, Cap::Renderable | intMultisampleCaps, ByteSize(1), SampleTypeBit::Sint, ComponentCount(1), RenderTargetPixelByteCost(1), RenderTargetComponentAlignment(1));
// 2 bytes color formats
+ auto rg8snormSupportsRender = device->HasFeature(Feature::TextureFormatsTier1) ? Cap::Renderable : Cap::None;
AddColorFormat(wgpu::TextureFormat::R16Uint, Cap::Renderable | intMultisampleCaps, ByteSize(2), SampleTypeBit::Uint, ComponentCount(1), RenderTargetPixelByteCost(2), RenderTargetComponentAlignment(2));
AddColorFormat(wgpu::TextureFormat::R16Sint, Cap::Renderable | intMultisampleCaps, ByteSize(2), SampleTypeBit::Sint, ComponentCount(1), RenderTargetPixelByteCost(2), RenderTargetComponentAlignment(2));
AddColorFormat(wgpu::TextureFormat::R16Float, Cap::Renderable | Cap::Multisample | Cap::Resolve | Cap::Blendable, ByteSize(2), kAnyFloat, ComponentCount(1), RenderTargetPixelByteCost(2), RenderTargetComponentAlignment(2));
AddColorFormat(wgpu::TextureFormat::RG8Unorm, Cap::Renderable | Cap::Multisample | Cap::Resolve | Cap::Blendable, ByteSize(2), kAnyFloat, ComponentCount(2), RenderTargetPixelByteCost(2), RenderTargetComponentAlignment(1));
- AddColorFormat(wgpu::TextureFormat::RG8Snorm, Cap::None, ByteSize(2), kAnyFloat, ComponentCount(2));
+ AddColorFormat(wgpu::TextureFormat::RG8Snorm, rg8snormSupportsRender, ByteSize(2), kAnyFloat, ComponentCount(2),RenderTargetPixelByteCost(2), RenderTargetComponentAlignment(2));
AddColorFormat(wgpu::TextureFormat::RG8Uint, Cap::Renderable | intMultisampleCaps, ByteSize(2), SampleTypeBit::Uint, ComponentCount(2), RenderTargetPixelByteCost(2), RenderTargetComponentAlignment(1));
AddColorFormat(wgpu::TextureFormat::RG8Sint, Cap::Renderable | intMultisampleCaps, ByteSize(2), SampleTypeBit::Sint, ComponentCount(2), RenderTargetPixelByteCost(2), RenderTargetComponentAlignment(1));
@@ -517,6 +519,7 @@
auto float32BlendableCaps = device->HasFeature(Feature::Float32Blendable) ? Cap::Blendable : Cap::None;
// (github.com/gpuweb/gpuweb/issues/5049): r32float compat multisampled support is optional
auto r32FloatMultisampleCaps = device->IsCompatibilityMode() ? Cap::None : Cap::Multisample;
+ auto rgba8snormSupportsRender = device->HasFeature(Feature::TextureFormatsTier1) ? Cap::Renderable : Cap::None;
AddColorFormat(wgpu::TextureFormat::R32Uint, Cap::Renderable | Cap::StorageROrW | Cap::StorageRW | supportsPLS, ByteSize(4), SampleTypeBit::Uint, ComponentCount(1), RenderTargetPixelByteCost(4), RenderTargetComponentAlignment(4));
AddColorFormat(wgpu::TextureFormat::R32Sint, Cap::Renderable | Cap::StorageROrW | Cap::StorageRW | supportsPLS, ByteSize(4), SampleTypeBit::Sint, ComponentCount(1), RenderTargetPixelByteCost(4), RenderTargetComponentAlignment(4));
@@ -526,7 +529,7 @@
AddColorFormat(wgpu::TextureFormat::RG16Float, Cap::Renderable | Cap::Multisample | Cap::Resolve | Cap::Blendable, ByteSize(4), kAnyFloat, ComponentCount(2), RenderTargetPixelByteCost(4), RenderTargetComponentAlignment(2));
AddColorFormat(wgpu::TextureFormat::RGBA8Unorm, Cap::Renderable | Cap::StorageROrW | Cap::Multisample | Cap::Resolve | Cap::Blendable, ByteSize(4), kAnyFloat, ComponentCount(4), RenderTargetPixelByteCost(8), RenderTargetComponentAlignment(1));
AddColorFormat(wgpu::TextureFormat::RGBA8UnormSrgb, Cap::Renderable | Cap::Multisample | Cap::Resolve | Cap::Blendable, ByteSize(4), kAnyFloat, ComponentCount(4), RenderTargetPixelByteCost(8), RenderTargetComponentAlignment(1), wgpu::TextureFormat::RGBA8Unorm);
- AddColorFormat(wgpu::TextureFormat::RGBA8Snorm, Cap::StorageROrW, ByteSize(4), kAnyFloat, ComponentCount(4));
+ AddColorFormat(wgpu::TextureFormat::RGBA8Snorm, Cap::StorageROrW | rgba8snormSupportsRender, ByteSize(4), kAnyFloat, ComponentCount(4), RenderTargetPixelByteCost(4), RenderTargetComponentAlignment(4));
AddColorFormat(wgpu::TextureFormat::RGBA8Uint, Cap::Renderable | Cap::StorageROrW | intMultisampleCaps, ByteSize(4), SampleTypeBit::Uint, ComponentCount(4), RenderTargetPixelByteCost(4), RenderTargetComponentAlignment(1));
AddColorFormat(wgpu::TextureFormat::RGBA8Sint, Cap::Renderable | Cap::StorageROrW | intMultisampleCaps, ByteSize(4), SampleTypeBit::Sint, ComponentCount(4), RenderTargetPixelByteCost(4), RenderTargetComponentAlignment(1));
diff --git a/src/dawn/node/binding/Converter.cpp b/src/dawn/node/binding/Converter.cpp
index 7a24781..a8c7322 100644
--- a/src/dawn/node/binding/Converter.cpp
+++ b/src/dawn/node/binding/Converter.cpp
@@ -1553,7 +1553,8 @@
out = wgpu::FeatureName::ChromiumExperimentalSubgroupMatrix;
return true;
case interop::GPUFeatureName::kTextureFormatsTier1:
- return false;
+ out = wgpu::FeatureName::TextureFormatsTier1;
+ return true;
}
return false;
}
@@ -1585,6 +1586,7 @@
CASE(DualSourceBlending, kDualSourceBlending);
CASE(ClipDistances, kClipDistances);
CASE(ChromiumExperimentalSubgroupMatrix, kChromiumExperimentalSubgroupMatrix);
+ CASE(TextureFormatsTier1, kTextureFormatsTier1);
#undef CASE
diff --git a/src/dawn/tests/unittests/validation/RenderPipelineValidationTests.cpp b/src/dawn/tests/unittests/validation/RenderPipelineValidationTests.cpp
index 654bf20..31d2692 100644
--- a/src/dawn/tests/unittests/validation/RenderPipelineValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/RenderPipelineValidationTests.cpp
@@ -3559,5 +3559,40 @@
}
}
+// Tests that r8snorm, rg8snorm and rgba8snorm are not renderable if the feature TextureFormatsTier1
+// is not enabled
+TEST_F(RenderPipelineValidationTest, SNORMFormatsNotRenderableWithoutFeature) {
+ const std::array kTestFormats = {wgpu::TextureFormat::R8Snorm, wgpu::TextureFormat::RG8Snorm,
+ wgpu::TextureFormat::RGBA8Snorm};
+ for (auto format : kTestFormats) {
+ utils::ComboRenderPipelineDescriptor descriptor;
+ descriptor.vertex.module = vsModule;
+ descriptor.cFragment.module = fsModule;
+ descriptor.cTargets[0].format = format;
+ ASSERT_DEVICE_ERROR(device.CreateRenderPipeline(&descriptor));
+ }
+}
+
+class TextureFormatsTier1PipelineTest : public RenderPipelineValidationTest {
+ protected:
+ std::vector<wgpu::FeatureName> GetRequiredFeatures() override {
+ return {wgpu::FeatureName::TextureFormatsTier1};
+ }
+};
+
+// Tests that r8snorm, rg8snorm and rgba8snorm must be renderable when the feature
+// TextureFormatsTier1 is enabled.
+TEST_F(TextureFormatsTier1PipelineTest, SNORMFormatsRenderableWithFeatureEnabled) {
+ const std::array kTestFormats = {wgpu::TextureFormat::R8Snorm, wgpu::TextureFormat::RG8Snorm,
+ wgpu::TextureFormat::RGBA8Snorm};
+ for (const auto format : kTestFormats) {
+ utils::ComboRenderPipelineDescriptor descriptor;
+ descriptor.vertex.module = vsModule;
+ descriptor.cFragment.module = fsModule;
+ descriptor.cTargets[0].format = format;
+ wgpu::RenderPipeline pipeline = device.CreateRenderPipeline(&descriptor);
+ }
+}
+
} // anonymous namespace
} // namespace dawn
diff --git a/src/dawn/tests/unittests/validation/TextureValidationTests.cpp b/src/dawn/tests/unittests/validation/TextureValidationTests.cpp
index cfea636..35ec6e7 100644
--- a/src/dawn/tests/unittests/validation/TextureValidationTests.cpp
+++ b/src/dawn/tests/unittests/validation/TextureValidationTests.cpp
@@ -1199,5 +1199,27 @@
ASSERT_DEVICE_ERROR(device.CreateTexture(&desc));
}
+class TextureFormatsTier1TextureTest : public TextureValidationTest {
+ protected:
+ std::vector<wgpu::FeatureName> GetRequiredFeatures() override {
+ return {wgpu::FeatureName::TextureFormatsTier1};
+ }
+};
+
+// Test that r8snorm, rg8snorm and rgba8snrom formats are valid as renderable texture if
+// 'texture-formats-tier1' is enabled.
+TEST_F(TextureFormatsTier1TextureTest, SNORMFormatsAreRenderableWithFeatureEnabled) {
+ const std::array kTestFormats = {wgpu::TextureFormat::R8Snorm, wgpu::TextureFormat::RG8Snorm,
+ wgpu::TextureFormat::RGBA8Snorm};
+ for (auto format : kTestFormats) {
+ wgpu::TextureDescriptor descriptor;
+ descriptor.size = {1, 1, 1};
+ descriptor.usage = wgpu::TextureUsage::RenderAttachment;
+ descriptor.format = format;
+
+ wgpu::Texture texture = device.CreateTexture(&descriptor);
+ }
+}
+
} // anonymous namespace
} // namespace dawn
diff --git a/src/dawn/wire/SupportedFeatures.cpp b/src/dawn/wire/SupportedFeatures.cpp
index 7636eef..ef576fd 100644
--- a/src/dawn/wire/SupportedFeatures.cpp
+++ b/src/dawn/wire/SupportedFeatures.cpp
@@ -118,6 +118,7 @@
case WGPUFeatureName_ChromiumExperimentalSubgroupMatrix:
case WGPUFeatureName_CoreFeaturesAndLimits:
case WGPUFeatureName_DawnDeviceAllocatorControl:
+ case WGPUFeatureName_TextureFormatsTier1:
return true;
}
