dawn.node: Clean subgroups features Roll third_party/gpuweb/ 5734d9537..a118ba5f2 (35 commits) https://github.com/gpuweb/gpuweb/compare/5734d953766c...a118ba5f2afa Created with: roll-dep third_party/gpuweb Change-Id: Iba241d3d472abc80d1c871b87e443ca25a2da292 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/223436 Reviewed-by: David Neto <dneto@google.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Fr <beaufort.francois@gmail.com> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
diff --git a/DEPS b/DEPS index e7443a3..504c35c 100644 --- a/DEPS +++ b/DEPS
@@ -375,7 +375,7 @@ 'condition': 'dawn_node', }, 'third_party/gpuweb': { - 'url': '{github_git}/gpuweb/gpuweb.git@5734d953766c44e10b535e000e14cdfbab0b79d7', + 'url': '{github_git}/gpuweb/gpuweb.git@a118ba5f2afaad9f763fe09c3a53f96cd9106cb1', 'condition': 'dawn_node', },
diff --git a/src/dawn/node/binding/Converter.cpp b/src/dawn/node/binding/Converter.cpp index cbb72bc..0b5b97c 100644 --- a/src/dawn/node/binding/Converter.cpp +++ b/src/dawn/node/binding/Converter.cpp
@@ -1516,9 +1516,6 @@ case interop::GPUFeatureName::kSubgroups: out = wgpu::FeatureName::Subgroups; return true; - case interop::GPUFeatureName::kSubgroupsF16: - out = wgpu::FeatureName::SubgroupsF16; - return true; case interop::GPUFeatureName::kMultiDrawIndirect: out = wgpu::FeatureName::MultiDrawIndirect; return true; @@ -1558,7 +1555,6 @@ CASE(TextureCompressionETC2, kTextureCompressionEtc2); CASE(TimestampQuery, kTimestampQuery); CASE(Subgroups, kSubgroups); - CASE(SubgroupsF16, kSubgroupsF16); CASE(MultiDrawIndirect, kMultiDrawIndirect); CASE(DualSourceBlending, kDualSourceBlending); CASE(ClipDistances, kClipDistances); @@ -1613,6 +1609,7 @@ case wgpu::FeatureName::SharedTextureMemoryVkDedicatedAllocation: case wgpu::FeatureName::SharedTextureMemoryZirconHandle: case wgpu::FeatureName::StaticSamplers: + case wgpu::FeatureName::SubgroupsF16: case wgpu::FeatureName::TransientAttachments: case wgpu::FeatureName::YCbCrVulkanSamplers: case wgpu::FeatureName::DawnLoadResolveTexture:
diff --git a/src/dawn/node/binding/GPUAdapterInfo.cpp b/src/dawn/node/binding/GPUAdapterInfo.cpp index e8f9446..ffce84b 100644 --- a/src/dawn/node/binding/GPUAdapterInfo.cpp +++ b/src/dawn/node/binding/GPUAdapterInfo.cpp
@@ -67,11 +67,11 @@ return description_; } -std::variant<uint32_t, interop::UndefinedType> GPUAdapterInfo::getSubgroupMinSize(Napi::Env) { +uint32_t GPUAdapterInfo::getSubgroupMinSize(Napi::Env) { return subgroup_properties_.subgroupMinSize; } -std::variant<uint32_t, interop::UndefinedType> GPUAdapterInfo::getSubgroupMaxSize(Napi::Env) { +uint32_t GPUAdapterInfo::getSubgroupMaxSize(Napi::Env) { return subgroup_properties_.subgroupMaxSize; }
diff --git a/src/dawn/node/binding/GPUAdapterInfo.h b/src/dawn/node/binding/GPUAdapterInfo.h index 1eb81cb..c4352c8 100644 --- a/src/dawn/node/binding/GPUAdapterInfo.h +++ b/src/dawn/node/binding/GPUAdapterInfo.h
@@ -48,8 +48,8 @@ std::string getArchitecture(Napi::Env) override; std::string getDevice(Napi::Env) override; std::string getDescription(Napi::Env) override; - std::variant<uint32_t, interop::UndefinedType> getSubgroupMinSize(Napi::Env) override; - std::variant<uint32_t, interop::UndefinedType> getSubgroupMaxSize(Napi::Env) override; + uint32_t getSubgroupMinSize(Napi::Env) override; + uint32_t getSubgroupMaxSize(Napi::Env) override; private: std::string vendor_;
diff --git a/src/dawn/node/interop/DawnExtensions.idl b/src/dawn/node/interop/DawnExtensions.idl index d7b6807..2aef172 100644 --- a/src/dawn/node/interop/DawnExtensions.idl +++ b/src/dawn/node/interop/DawnExtensions.idl
@@ -29,9 +29,6 @@ // upstream webgpu.idl. enum GPUFeatureName { - // subgroups, subgroups-f16 and multi-draw-indirect features are not in webgpu.idl yet. - "subgroups", - "subgroups-f16", "multi-draw-indirect", "chromium-experimental-immediate-data", }; @@ -41,13 +38,6 @@ readonly attribute DOMString featureLevel; }; -// Not in webgpu.idl yet -interface GPUAdapterInfo { - readonly attribute (unsigned long or undefined) subgroupMinSize; - readonly attribute (unsigned long or undefined) subgroupMaxSize; -}; - - interface GPUCommandEncoder { undefined writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex); };
diff --git a/third_party/gpuweb b/third_party/gpuweb index 5734d95..a118ba5 160000 --- a/third_party/gpuweb +++ b/third_party/gpuweb
@@ -1 +1 @@ -Subproject commit 5734d953766c44e10b535e000e14cdfbab0b79d7 +Subproject commit a118ba5f2afaad9f763fe09c3a53f96cd9106cb1