Roll third_party/gpuweb/ 75702cb31..2629ea6a9 (17 commits)
https://github.com/gpuweb/gpuweb/compare/75702cb31c03...2629ea6a98a2
Includes the rename of the copy types for dawn.node.
Created with:
roll-dep third_party/gpuweb
Change-Id: I5e17aaffd1688540a1b58c80d549e079c60ea140
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/213437
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
diff --git a/DEPS b/DEPS
index f0a1b5e..57246cd 100644
--- a/DEPS
+++ b/DEPS
@@ -381,7 +381,7 @@
'condition': 'dawn_node',
},
'third_party/gpuweb': {
- 'url': '{github_git}/gpuweb/gpuweb.git@75702cb31c03bc90d34dc87676d1ab0cc131b53a',
+ 'url': '{github_git}/gpuweb/gpuweb.git@2629ea6a98a2b87250aa165032f6d67c04c109f9',
'condition': 'dawn_node',
},
diff --git a/src/dawn/node/binding/Converter.cpp b/src/dawn/node/binding/Converter.cpp
index 7eca5f1..36147cf 100644
--- a/src/dawn/node/binding/Converter.cpp
+++ b/src/dawn/node/binding/Converter.cpp
@@ -147,13 +147,13 @@
return Throw("invalid value for GPUTextureAspect");
}
-bool Converter::Convert(wgpu::ImageCopyTexture& out, const interop::GPUImageCopyTexture& in) {
+bool Converter::Convert(wgpu::ImageCopyTexture& out, const interop::GPUTexelCopyTextureInfo& in) {
out = {};
return Convert(out.texture, in.texture) && Convert(out.mipLevel, in.mipLevel) &&
Convert(out.origin, in.origin) && Convert(out.aspect, in.aspect);
}
-bool Converter::Convert(wgpu::ImageCopyBuffer& out, const interop::GPUImageCopyBuffer& in) {
+bool Converter::Convert(wgpu::ImageCopyBuffer& out, const interop::GPUTexelCopyBufferInfo& in) {
out = {};
out.buffer = *in.buffer.As<GPUBuffer>();
return Convert(out.layout.offset, in.offset) &&
@@ -183,7 +183,7 @@
return Throw("invalid value for BufferSource");
}
-bool Converter::Convert(wgpu::TextureDataLayout& out, const interop::GPUImageDataLayout& in) {
+bool Converter::Convert(wgpu::TextureDataLayout& out, const interop::GPUTexelCopyBufferLayout& in) {
out = {};
return Convert(out.bytesPerRow, in.bytesPerRow) && Convert(out.offset, in.offset) &&
Convert(out.rowsPerImage, in.rowsPerImage);
diff --git a/src/dawn/node/binding/Converter.h b/src/dawn/node/binding/Converter.h
index c33a68b..ea50d41 100644
--- a/src/dawn/node/binding/Converter.h
+++ b/src/dawn/node/binding/Converter.h
@@ -129,13 +129,16 @@
[[nodiscard]] bool Convert(wgpu::TextureAspect& out, const interop::GPUTextureAspect& in);
- [[nodiscard]] bool Convert(wgpu::ImageCopyTexture& out, const interop::GPUImageCopyTexture& in);
+ [[nodiscard]] bool Convert(wgpu::ImageCopyTexture& out,
+ const interop::GPUTexelCopyTextureInfo& in);
- [[nodiscard]] bool Convert(wgpu::ImageCopyBuffer& out, const interop::GPUImageCopyBuffer& in);
+ [[nodiscard]] bool Convert(wgpu::ImageCopyBuffer& out,
+ const interop::GPUTexelCopyBufferInfo& in);
[[nodiscard]] bool Convert(BufferSource& out, interop::BufferSource in);
- [[nodiscard]] bool Convert(wgpu::TextureDataLayout& out, const interop::GPUImageDataLayout& in);
+ [[nodiscard]] bool Convert(wgpu::TextureDataLayout& out,
+ const interop::GPUTexelCopyBufferLayout& in);
[[nodiscard]] bool Convert(wgpu::TextureFormat& out, const interop::GPUTextureFormat& in);
diff --git a/src/dawn/node/binding/GPUCommandEncoder.cpp b/src/dawn/node/binding/GPUCommandEncoder.cpp
index 06b82c5..de1dd04 100644
--- a/src/dawn/node/binding/GPUCommandEncoder.cpp
+++ b/src/dawn/node/binding/GPUCommandEncoder.cpp
@@ -119,8 +119,8 @@
}
void GPUCommandEncoder::copyBufferToTexture(Napi::Env env,
- interop::GPUImageCopyBuffer source,
- interop::GPUImageCopyTexture destination,
+ interop::GPUTexelCopyBufferInfo source,
+ interop::GPUTexelCopyTextureInfo destination,
interop::GPUExtent3D copySize) {
Converter conv(env);
@@ -137,8 +137,8 @@
}
void GPUCommandEncoder::copyTextureToBuffer(Napi::Env env,
- interop::GPUImageCopyTexture source,
- interop::GPUImageCopyBuffer destination,
+ interop::GPUTexelCopyTextureInfo source,
+ interop::GPUTexelCopyBufferInfo destination,
interop::GPUExtent3D copySize) {
Converter conv(env);
@@ -155,8 +155,8 @@
}
void GPUCommandEncoder::copyTextureToTexture(Napi::Env env,
- interop::GPUImageCopyTexture source,
- interop::GPUImageCopyTexture destination,
+ interop::GPUTexelCopyTextureInfo source,
+ interop::GPUTexelCopyTextureInfo destination,
interop::GPUExtent3D copySize) {
Converter conv(env);
diff --git a/src/dawn/node/binding/GPUCommandEncoder.h b/src/dawn/node/binding/GPUCommandEncoder.h
index 7f527d9..14fc2c2 100644
--- a/src/dawn/node/binding/GPUCommandEncoder.h
+++ b/src/dawn/node/binding/GPUCommandEncoder.h
@@ -64,16 +64,16 @@
interop::GPUSize64 destinationOffset,
interop::GPUSize64 size) override;
void copyBufferToTexture(Napi::Env,
- interop::GPUImageCopyBuffer source,
- interop::GPUImageCopyTexture destination,
+ interop::GPUTexelCopyBufferInfo source,
+ interop::GPUTexelCopyTextureInfo destination,
interop::GPUExtent3D copySize) override;
void copyTextureToBuffer(Napi::Env,
- interop::GPUImageCopyTexture source,
- interop::GPUImageCopyBuffer destination,
+ interop::GPUTexelCopyTextureInfo source,
+ interop::GPUTexelCopyBufferInfo destination,
interop::GPUExtent3D copySize) override;
void copyTextureToTexture(Napi::Env,
- interop::GPUImageCopyTexture source,
- interop::GPUImageCopyTexture destination,
+ interop::GPUTexelCopyTextureInfo source,
+ interop::GPUTexelCopyTextureInfo destination,
interop::GPUExtent3D copySize) override;
void pushDebugGroup(Napi::Env, std::string groupLabel) override;
void popDebugGroup(Napi::Env) override;
diff --git a/src/dawn/node/binding/GPUQueue.cpp b/src/dawn/node/binding/GPUQueue.cpp
index d6f796a..8638a68 100644
--- a/src/dawn/node/binding/GPUQueue.cpp
+++ b/src/dawn/node/binding/GPUQueue.cpp
@@ -127,9 +127,9 @@
}
void GPUQueue::writeTexture(Napi::Env env,
- interop::GPUImageCopyTexture destination,
+ interop::GPUTexelCopyTextureInfo destination,
interop::AllowSharedBufferSource data,
- interop::GPUImageDataLayout dataLayout,
+ interop::GPUTexelCopyBufferLayout dataLayout,
interop::GPUExtent3D size) {
wgpu::ImageCopyTexture dst{};
Converter::BufferSource src{};
@@ -147,8 +147,8 @@
}
void GPUQueue::copyExternalImageToTexture(Napi::Env env,
- interop::GPUImageCopyExternalImage source,
- interop::GPUImageCopyTextureTagged destination,
+ interop::GPUCopyExternalImageSourceInfo source,
+ interop::GPUCopyExternalImageDestInfo destination,
interop::GPUExtent3D copySize) {
UNIMPLEMENTED(env);
}
diff --git a/src/dawn/node/binding/GPUQueue.h b/src/dawn/node/binding/GPUQueue.h
index bb81879..162bb0b 100644
--- a/src/dawn/node/binding/GPUQueue.h
+++ b/src/dawn/node/binding/GPUQueue.h
@@ -57,13 +57,13 @@
interop::GPUSize64 dataOffset,
std::optional<interop::GPUSize64> size) override;
void writeTexture(Napi::Env,
- interop::GPUImageCopyTexture destination,
+ interop::GPUTexelCopyTextureInfo destination,
interop::AllowSharedBufferSource data,
- interop::GPUImageDataLayout dataLayout,
+ interop::GPUTexelCopyBufferLayout dataLayout,
interop::GPUExtent3D size) override;
void copyExternalImageToTexture(Napi::Env,
- interop::GPUImageCopyExternalImage source,
- interop::GPUImageCopyTextureTagged destination,
+ interop::GPUCopyExternalImageSourceInfo source,
+ interop::GPUCopyExternalImageDestInfo destination,
interop::GPUExtent3D copySize) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
diff --git a/third_party/gpuweb b/third_party/gpuweb
index 75702cb..2629ea6 160000
--- a/third_party/gpuweb
+++ b/third_party/gpuweb
@@ -1 +1 @@
-Subproject commit 75702cb31c03bc90d34dc87676d1ab0cc131b53a
+Subproject commit 2629ea6a98a2b87250aa165032f6d67c04c109f9
