Make it invalid to use sampleType "float" with multisampled textures
Fixed: dawn:1540 Change-Id: I31f197d802c20ed7e6ef2ae00d4e107ab6f94278 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/102420 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
parent
18dfc4797c
commit
9b2f273d36
|
@ -113,6 +113,11 @@ MaybeError ValidateBindGroupLayoutEntry(DeviceBase* device,
|
|||
DAWN_INVALID_IF(texture.multisampled && viewDimension != wgpu::TextureViewDimension::e2D,
|
||||
"View dimension (%s) for a multisampled texture bindings was not %s.",
|
||||
viewDimension, wgpu::TextureViewDimension::e2D);
|
||||
|
||||
DAWN_INVALID_IF(
|
||||
texture.multisampled && texture.sampleType == wgpu::TextureSampleType::Float,
|
||||
"Sample type for multisampled texture bindings must not be %s.",
|
||||
wgpu::TextureSampleType::Float);
|
||||
}
|
||||
|
||||
if (entry.storageTexture.access != wgpu::StorageTextureAccess::Undefined) {
|
||||
|
|
|
@ -781,7 +781,7 @@ TEST_F(BindGroupValidationTest, BufferOffsetAlignment) {
|
|||
// Tests constraints on the texture for MultisampledTexture bindings
|
||||
TEST_F(BindGroupValidationTest, MultisampledTexture) {
|
||||
wgpu::BindGroupLayout layout = utils::MakeBindGroupLayout(
|
||||
device, {{0, wgpu::ShaderStage::Fragment, wgpu::TextureSampleType::Float,
|
||||
device, {{0, wgpu::ShaderStage::Fragment, wgpu::TextureSampleType::UnfilterableFloat,
|
||||
wgpu::TextureViewDimension::e2D, true}});
|
||||
|
||||
wgpu::BindGroupEntry binding;
|
||||
|
@ -1420,63 +1420,70 @@ TEST_F(BindGroupLayoutValidationTest, DynamicBufferNumberLimit) {
|
|||
// Test that multisampled textures must be 2D sampled textures
|
||||
TEST_F(BindGroupLayoutValidationTest, MultisampledTextureViewDimension) {
|
||||
// Multisampled 2D texture works.
|
||||
utils::MakeBindGroupLayout(device,
|
||||
{
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,
|
||||
wgpu::TextureViewDimension::e2D, true},
|
||||
});
|
||||
utils::MakeBindGroupLayout(
|
||||
device, {
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::UnfilterableFloat,
|
||||
wgpu::TextureViewDimension::e2D, true},
|
||||
});
|
||||
|
||||
// Multisampled 2D (defaulted) texture works.
|
||||
utils::MakeBindGroupLayout(device,
|
||||
{
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,
|
||||
wgpu::TextureViewDimension::Undefined, true},
|
||||
});
|
||||
utils::MakeBindGroupLayout(
|
||||
device, {
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::UnfilterableFloat,
|
||||
wgpu::TextureViewDimension::Undefined, true},
|
||||
});
|
||||
|
||||
// Multisampled 2D array texture is invalid.
|
||||
ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout(
|
||||
device, {
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::UnfilterableFloat,
|
||||
wgpu::TextureViewDimension::e2DArray, true},
|
||||
}));
|
||||
|
||||
// Multisampled cube texture is invalid.
|
||||
ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout(
|
||||
device, {
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::UnfilterableFloat,
|
||||
wgpu::TextureViewDimension::Cube, true},
|
||||
}));
|
||||
|
||||
// Multisampled cube array texture is invalid.
|
||||
ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout(
|
||||
device, {
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::UnfilterableFloat,
|
||||
wgpu::TextureViewDimension::CubeArray, true},
|
||||
}));
|
||||
|
||||
// Multisampled 3D texture is invalid.
|
||||
ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout(
|
||||
device, {
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::UnfilterableFloat,
|
||||
wgpu::TextureViewDimension::e3D, true},
|
||||
}));
|
||||
|
||||
// Multisampled 1D texture is invalid.
|
||||
ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout(
|
||||
device, {
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::UnfilterableFloat,
|
||||
wgpu::TextureViewDimension::e1D, true},
|
||||
}));
|
||||
}
|
||||
|
||||
// Test that multisampled texture bindings are valid
|
||||
TEST_F(BindGroupLayoutValidationTest, MultisampledTextureSampleType) {
|
||||
// Multisampled float sample type works.
|
||||
utils::MakeBindGroupLayout(device,
|
||||
{
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,
|
||||
wgpu::TextureViewDimension::e2D, true},
|
||||
});
|
||||
// Multisampled float sample type invalid.
|
||||
ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout(
|
||||
device, {
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,
|
||||
wgpu::TextureViewDimension::e2D, true},
|
||||
}));
|
||||
|
||||
// Multisampled unfilterable float sample type works.
|
||||
utils::MakeBindGroupLayout(
|
||||
device, {
|
||||
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::UnfilterableFloat,
|
||||
wgpu::TextureViewDimension::e2D, true},
|
||||
});
|
||||
|
||||
// Multisampled uint sample type works.
|
||||
utils::MakeBindGroupLayout(device,
|
||||
|
|
|
@ -633,6 +633,30 @@ crbug.com/dawn/0000 [ mac ] worker_webgpu:api,operation,render_pass,storeOp:rend
|
|||
################################################################################
|
||||
crbug.com/dawn/0000 [ win ] webgpu:shader,execution,expression,binary,f32_logical:* [ Slow ]
|
||||
|
||||
################################################################################
|
||||
# test bug. need validation update
|
||||
# github.com/gpuweb/cts/issues/1848
|
||||
################################################################################
|
||||
webgpu:api,validation,createBindGroup:binding_must_contain_resource_defined_in_layout: [ Failure ]
|
||||
webgpu:api,validation,createBindGroup:texture,resource_state: [ Failure ]
|
||||
webgpu:api,validation,createBindGroup:texture_binding_must_have_correct_usage: [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:max_resources_per_stage,in_bind_group_layout:maxedEntry={"texture":{"multisampled":false}} [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:max_resources_per_stage,in_bind_group_layout:maxedEntry={"texture":{"multisampled":true}} [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:max_resources_per_stage,in_pipeline_layout:maxedEntry={"texture":{"multisampled":false}} [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:max_resources_per_stage,in_pipeline_layout:maxedEntry={"texture":{"multisampled":true}} [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:multisampled_validation: [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:visibility:visibility=0 [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:visibility:visibility=1 [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:visibility:visibility=2 [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:visibility:visibility=3 [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:visibility:visibility=4 [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:visibility:visibility=5 [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:visibility:visibility=6 [ Failure ]
|
||||
webgpu:api,validation,createBindGroupLayout:visibility:visibility=7 [ Failure ]
|
||||
webgpu:api,validation,resource_usages,texture,in_pass_encoder:bindings_in_bundle:type0="multisampled-texture";type1="multisampled-texture" [ Failure ]
|
||||
webgpu:api,validation,resource_usages,texture,in_pass_encoder:bindings_in_bundle:type0="multisampled-texture";type1="render-target" [ Failure ]
|
||||
webgpu:api,validation,resource_usages,texture,in_pass_encoder:bindings_in_bundle:type0="render-target";type1="multisampled-texture" [ Failure ]
|
||||
|
||||
# New failures. Please triage:
|
||||
crbug.com/dawn/0000 [ intel-gen-9 win10 ] webgpu:api,operation,command_buffer,image_copy:mip_levels:initMethod="WriteTexture";checkMethod="PartialCopyT2B";format="rgba32uint";dimension="2d" [ Failure ]
|
||||
crbug.com/dawn/0000 webgpu:api,operation,device,lost:not_lost_on_gc: [ Failure ]
|
||||
|
|
Loading…
Reference in New Issue