Roll third_party/gpuweb/ 17f777185..1000c3b25 (20 commits)
- Adds depthSlice
- Makes depthWriteEnabled / depthCompare optional
- Adds "read-only" / "read-write" access modes for storage textures
- (changed in the IDL but noop for dawn.node): hints -> compilationHints
https://github.com/gpuweb/gpuweb/compare/17f7771857dd...1000c3b256b0
$ git log 17f777185..1000c3b25 --date=short --no-merges --format='%ad %ae %s'
2023-11-03 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@306fbd8eff6cee52e6301d31f963d8440cbc1d67 🚀
2023-11-03 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@eaafdefc9e0c91547318da09137d726a21d97449 🚀
2023-10-31 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@3243b5862272ed97abbbb69d521bdabcddfbf756 🚀
2023-10-31 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@3adf6380d7a5e8f8c0e823f1ac8f55725ee68f2c 🚀
2023-10-23 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@8ef67d6c941e30127c5fc0211d40c881bc23bebb 🚀
2023-10-20 elsenorblanco Deploying to gh-pages from @ gpuweb/gpuweb@34154af636206c9a9ed12de21fa4495a9f8d2253 🚀
2023-10-20 alanbaker Deploying to gh-pages from @ gpuweb/gpuweb@7d903a0f703f4d3085c035fa8df3bcac14c50664 🚀
2023-10-19 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@8cc6252f9fde96e8c53a18a48e27faf2b5a4f448 🚀
2023-10-18 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@043f92b9bfb7e97002e170cbc5175ecbaa22607b 🚀
2023-10-17 elsenorblanco Deploying to gh-pages from @ gpuweb/gpuweb@5a5c94230ffb0e62513fba99dec765c1c90fffe9 🚀
2023-10-13 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@073a70497c548e4f0c128695494fa691d1914fb4 🚀
2023-10-13 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@b9d4153aba66a0dd607d955de3caa8c927f27195 🚀
2023-10-12 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@1e2161afc194c84d323717d04d29648f496601aa 🚀
2023-10-12 alanbaker Deploying to gh-pages from @ gpuweb/gpuweb@6ff1cb21f7ca7cc390d156bd7e6245e9939cb699 🚀
2023-10-12 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@eacef8989d39ee9579e6d560935b10d6f9371651 🚀
2023-10-11 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@be0515f355e1ba9cf2f3c79f4c03d9eced802948 🚀
2023-10-11 alanbaker Deploying to gh-pages from @ gpuweb/gpuweb@e456b4d84345dd98909072c52ed801aba45f498a 🚀
2023-10-10 tojiro Deploying to gh-pages from @ gpuweb/gpuweb@b56f660b200cf07ee9fc7ba865751f3710f285b2 🚀
2023-10-10 kainino1 Deploying to gh-pages from @ gpuweb/gpuweb@3d03b3337ffb46103109ad0b15f01354b872b2c3 🚀
2023-10-10 tojiro Deploying to gh-pages from @ gpuweb/gpuweb@7bec2a342e470d5317102533f0b339fa8ccd1929 🚀
Created with:
roll-dep third_party/gpuweb
Bug: dawn:1020, dawn:1972, dawn:2132
Change-Id: Idcadc6a3281e2ce509c036107269df9e08d7a200
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/159360
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/DEPS b/DEPS
index dbfc0ec..d4821d2 100644
--- a/DEPS
+++ b/DEPS
@@ -230,7 +230,7 @@
'condition': 'dawn_node',
},
'third_party/gpuweb': {
- 'url': '{github_git}/gpuweb/gpuweb.git@17f7771857dd6cf0377a99e6a63a723b80485e50',
+ 'url': '{github_git}/gpuweb/gpuweb.git@1000c3b256b04988f7d747bb7689d03ad9417a1d',
'condition': 'dawn_node',
},
diff --git a/dawn.json b/dawn.json
index 6a5c97e..5801342 100644
--- a/dawn.json
+++ b/dawn.json
@@ -2863,8 +2863,8 @@
"extensible": "in",
"members": [
{"name": "format", "type": "texture format"},
- {"name": "depth write enabled", "type": "bool"},
- {"name": "depth compare", "type": "compare function"},
+ {"name": "depth write enabled", "type": "bool", "default": "false"},
+ {"name": "depth compare", "type": "compare function", "default": "undefined"},
{"name": "stencil front", "type": "stencil face state"},
{"name": "stencil back", "type": "stencil face state"},
{"name": "stencil read mask", "type": "uint32_t", "default": "0xFFFFFFFF"},
diff --git a/src/dawn/node/binding/Converter.cpp b/src/dawn/node/binding/Converter.cpp
index dc8cb2c6..2ba01a4 100644
--- a/src/dawn/node/binding/Converter.cpp
+++ b/src/dawn/node/binding/Converter.cpp
@@ -905,6 +905,11 @@
bool Converter::Convert(wgpu::DepthStencilState& out, const interop::GPUDepthStencilState& in) {
out = {};
+
+ auto depthWriteDefined = Allocate<wgpu::DepthStencilStateDepthWriteDefinedDawn>();
+ depthWriteDefined->depthWriteDefined = in.depthWriteEnabled.has_value();
+ out.nextInChain = depthWriteDefined;
+
return Convert(out.format, in.format) && Convert(out.depthWriteEnabled, in.depthWriteEnabled) &&
Convert(out.depthCompare, in.depthCompare) &&
Convert(out.stencilFront, in.stencilFront) && Convert(out.stencilBack, in.stencilBack) &&
@@ -1223,6 +1228,7 @@
const interop::GPURenderPassColorAttachment& in) {
out = {};
return Convert(out.view, in.view) && //
+ Convert(out.depthSlice, in.depthSlice) && //
Convert(out.resolveTarget, in.resolveTarget) && //
Convert(out.clearValue, in.clearValue) && //
Convert(out.loadOp, in.loadOp) && //
@@ -1409,6 +1415,12 @@
case interop::GPUStorageTextureAccess::kWriteOnly:
out = wgpu::StorageTextureAccess::WriteOnly;
return true;
+ case interop::GPUStorageTextureAccess::kReadOnly:
+ out = wgpu::StorageTextureAccess::ReadOnly;
+ return true;
+ case interop::GPUStorageTextureAccess::kReadWrite:
+ out = wgpu::StorageTextureAccess::ReadWrite;
+ return true;
}
Napi::Error::New(env, "invalid value for GPUStorageTextureAccess").ThrowAsJavaScriptException();
return false;
diff --git a/third_party/gpuweb b/third_party/gpuweb
index 17f7771..1000c3b 160000
--- a/third_party/gpuweb
+++ b/third_party/gpuweb
@@ -1 +1 @@
-Subproject commit 17f7771857dd6cf0377a99e6a63a723b80485e50
+Subproject commit 1000c3b256b04988f7d747bb7689d03ad9417a1d
