diff --git a/src/dawn_native/ShaderModule.cpp b/src/dawn_native/ShaderModule.cpp index 47badae871..4c227063f5 100644 --- a/src/dawn_native/ShaderModule.cpp +++ b/src/dawn_native/ShaderModule.cpp @@ -165,7 +165,6 @@ namespace dawn_native { case tint::inspector::ResourceBinding::ResourceType::kDepthTexture: case tint::inspector::ResourceBinding::ResourceType::kDepthMultisampledTexture: return BindingInfoType::Texture; - case tint::inspector::ResourceBinding::ResourceType::kReadOnlyStorageTexture: case tint::inspector::ResourceBinding::ResourceType::kWriteOnlyStorageTexture: return BindingInfoType::StorageTexture; case tint::inspector::ResourceBinding::ResourceType::kExternalTexture: diff --git a/src/dawn_native/dawn_platform.h b/src/dawn_native/dawn_platform.h index 522259a4db..d36a48af0c 100644 --- a/src/dawn_native/dawn_platform.h +++ b/src/dawn_native/dawn_platform.h @@ -23,9 +23,19 @@ #include namespace dawn_native { + // Extra buffer usages + // Add an extra buffer usage and an extra binding type for binding the buffers with QueryResolve + // usage as storage buffer in the internal pipeline. + static constexpr wgpu::BufferUsage kInternalStorageBuffer = + static_cast(0x40000000); + // Add an extra buffer usage (readonly storage buffer usage) for render pass resource tracking static constexpr wgpu::BufferUsage kReadOnlyStorageBuffer = static_cast(0x80000000); + + // Extra texture usages + // Add an extra texture usage (readonly render attachment usage) for render pass resource + // tracking static constexpr wgpu::TextureUsage kReadOnlyRenderAttachment = static_cast(0x40000000); @@ -40,10 +50,6 @@ namespace dawn_native { // some bit when wgpu::TextureUsage::Present is removed. static constexpr wgpu::TextureUsage kPresentTextureUsage = wgpu::TextureUsage::Present; - // Add an extra buffer usage and an extra binding type for binding the buffers with QueryResolve - // usage as storage buffer in the internal pipeline. - static constexpr wgpu::BufferUsage kInternalStorageBuffer = - static_cast(0x40000000); static constexpr wgpu::BufferBindingType kInternalStorageBufferBinding = static_cast(0xFFFFFFFF); } // namespace dawn_native