Roll src/third_party/dawn 8f93871dfff5..f697fe3b7dd2 (1 commit)
This patch also updates Blink to match Dawn API changes.
https://dawn.googlesource.com/dawn.git/+log/8f93871dfff5..f697fe3b7dd2
git log 8f93871dfff5..f697fe3b7dd2 --date=short --no-merges --format='%ad %ae %s'
2019-07-09 shaobo.yan@intel.com Add dynamic attribute in bind group layout binding
Created with:
gclient setdep -r src/third_party/dawn@f697fe3b7dd2
CQ_INCLUDE_TRYBOTS=luci.chromium.try:dawn-linux-x64-deps-rel;luci.chromium.try:dawn-mac-x64-deps-rel;luci.chromium.try:dawn-win10-x64-deps-rel;luci.chromium.try:dawn-win10-x86-deps-rel
TBR=cwallez@chromium.org
Change-Id: I61db2ec057ef067961013aebb690daa50b6d975c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1693206
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Cr-Commit-Position: refs/heads/master@{#675784}
diff --git a/DEPS b/DEPS
index 46d6798..240760c 100644
--- a/DEPS
+++ b/DEPS
@@ -277,7 +277,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
- 'dawn_revision': '8f93871dfff513ce9f0d19debf3f22144399aa6b',
+ 'dawn_revision': 'f697fe3b7dd2c14f406fd6663b1682359b4a1d2f',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
diff --git a/third_party/blink/renderer/modules/webgpu/dawn_conversions.cc b/third_party/blink/renderer/modules/webgpu/dawn_conversions.cc
index 3ecc2ab..dccb08c 100644
--- a/third_party/blink/renderer/modules/webgpu/dawn_conversions.cc
+++ b/third_party/blink/renderer/modules/webgpu/dawn_conversions.cc
@@ -29,9 +29,6 @@
if (webgpu_enum == "uniform-buffer") {
return DAWN_BINDING_TYPE_UNIFORM_BUFFER;
}
- if (webgpu_enum == "dynamic-uniform-buffer") {
- return DAWN_BINDING_TYPE_DYNAMIC_UNIFORM_BUFFER;
- }
NOTREACHED();
return DAWN_BINDING_TYPE_FORCE32;
}
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout.cc b/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout.cc
index a2b868f..f6ea0d1 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout.cc
+++ b/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout.cc
@@ -18,6 +18,7 @@
dawn_binding.type = AsDawnEnum<DawnBindingType>(webgpu_binding->type());
dawn_binding.visibility =
AsDawnEnum<DawnShaderStageBit>(webgpu_binding->visibility());
+ dawn_binding.dynamic = webgpu_binding->dynamic();
return dawn_binding;
}
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout_binding.idl b/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout_binding.idl
index 0cc8d841..8a07a34 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout_binding.idl
+++ b/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout_binding.idl
@@ -8,6 +8,7 @@
required unsigned long binding;
required GPUShaderStageFlags visibility;
required GPUBindingType type;
+ boolean dynamic = false;
};
enum GPUBindingType {
@@ -16,5 +17,4 @@
"sampler",
"sampled-texture",
"storage-buffer",
- "dynamic-storage-buffer"
};
