Roll third_party/gpuweb to 1f8a05a

Fixup Dawn node as necessary.

Change-Id: I96b9a078adba1c8988f9bc5835e1f7645c67a57d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/123501
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: James Price <jrprice@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
James Price 2023-03-10 11:06:36 +00:00 committed by Dawn LUCI CQ
parent 783285fa1c
commit 55509fae00
8 changed files with 15 additions and 5 deletions

2
DEPS
View File

@ -172,7 +172,7 @@ deps = {
'condition': 'dawn_node', 'condition': 'dawn_node',
}, },
'third_party/gpuweb': { 'third_party/gpuweb': {
'url': '{github_git}/gpuweb/gpuweb.git@0f5fc665a0d5b281e8119f0201e9067b05cf7927', 'url': '{github_git}/gpuweb/gpuweb.git@1f8a05afc72627d9f7f45d6067f3e373d0a81f8e',
'condition': 'dawn_node', 'condition': 'dawn_node',
}, },

View File

@ -1659,6 +1659,9 @@ bool Converter::Convert(wgpu::FeatureName& out, interop::GPUFeatureName in) {
case interop::GPUFeatureName::kBgra8UnormStorage: case interop::GPUFeatureName::kBgra8UnormStorage:
out = wgpu::FeatureName::BGRA8UnormStorage; out = wgpu::FeatureName::BGRA8UnormStorage;
return true; return true;
case interop::GPUFeatureName::kFloat32Filterable:
UNIMPLEMENTED("TODO(crbug.com/dawn/1687)");
return false;
} }
return false; return false;
} }

View File

@ -28,8 +28,8 @@ namespace wgpu::binding {
GPUShaderModule::GPUShaderModule(wgpu::ShaderModule shader, std::shared_ptr<AsyncRunner> async) GPUShaderModule::GPUShaderModule(wgpu::ShaderModule shader, std::shared_ptr<AsyncRunner> async)
: shader_(std::move(shader)), async_(std::move(async)) {} : shader_(std::move(shader)), async_(std::move(async)) {}
interop::Promise<interop::Interface<interop::GPUCompilationInfo>> GPUShaderModule::compilationInfo( interop::Promise<interop::Interface<interop::GPUCompilationInfo>>
Napi::Env env) { GPUShaderModule::getCompilationInfo(Napi::Env env) {
struct GPUCompilationMessage : public interop::GPUCompilationMessage { struct GPUCompilationMessage : public interop::GPUCompilationMessage {
WGPUCompilationMessage message; WGPUCompilationMessage message;

View File

@ -36,7 +36,7 @@ class GPUShaderModule final : public interop::GPUShaderModule {
inline operator const wgpu::ShaderModule&() const { return shader_; } inline operator const wgpu::ShaderModule&() const { return shader_; }
// interop::GPUShaderModule interface compliance // interop::GPUShaderModule interface compliance
interop::Promise<interop::Interface<interop::GPUCompilationInfo>> compilationInfo( interop::Promise<interop::Interface<interop::GPUCompilationInfo>> getCompilationInfo(
Napi::Env) override; Napi::Env) override;
std::string getLabel(Napi::Env) override; std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override; void setLabel(Napi::Env, std::string value) override;

View File

@ -148,4 +148,8 @@ uint32_t GPUSupportedLimits::getMaxComputeWorkgroupsPerDimension(Napi::Env) {
return limits_.limits.maxComputeWorkgroupsPerDimension; return limits_.limits.maxComputeWorkgroupsPerDimension;
} }
uint32_t GPUSupportedLimits::getMaxFragmentCombinedOutputResources(Napi::Env) {
return limits_.limits.maxFragmentCombinedOutputResources;
}
} // namespace wgpu::binding } // namespace wgpu::binding

View File

@ -60,6 +60,7 @@ class GPUSupportedLimits final : public interop::GPUSupportedLimits {
uint32_t getMaxComputeWorkgroupSizeY(Napi::Env) override; uint32_t getMaxComputeWorkgroupSizeY(Napi::Env) override;
uint32_t getMaxComputeWorkgroupSizeZ(Napi::Env) override; uint32_t getMaxComputeWorkgroupSizeZ(Napi::Env) override;
uint32_t getMaxComputeWorkgroupsPerDimension(Napi::Env) override; uint32_t getMaxComputeWorkgroupsPerDimension(Napi::Env) override;
uint32_t getMaxFragmentCombinedOutputResources(Napi::Env) override;
private: private:
wgpu::SupportedLimits limits_; wgpu::SupportedLimits limits_;

View File

@ -87,4 +87,6 @@ typedef(ArrayBufferView or ArrayBuffer) BufferSource;
[LegacyNoInterfaceObject] interface EventHandler{}; [LegacyNoInterfaceObject] interface EventHandler{};
[LegacyNoInterfaceObject] interface DOMException {};
enum PredefinedColorSpace { "srgb", "display-p3" }; enum PredefinedColorSpace { "srgb", "display-p3" };

View File

@ -135,7 +135,7 @@ wrapPromiseWithHeartbeat(GPUDevice.prototype, 'createComputePipelineAsync');
wrapPromiseWithHeartbeat(GPUDevice.prototype, 'popErrorScope'); wrapPromiseWithHeartbeat(GPUDevice.prototype, 'popErrorScope');
wrapPromiseWithHeartbeat(GPUQueue.prototype, 'onSubmittedWorkDone'); wrapPromiseWithHeartbeat(GPUQueue.prototype, 'onSubmittedWorkDone');
wrapPromiseWithHeartbeat(GPUBuffer.prototype, 'mapAsync'); wrapPromiseWithHeartbeat(GPUBuffer.prototype, 'mapAsync');
wrapPromiseWithHeartbeat(GPUShaderModule.prototype, 'compilationInfo'); wrapPromiseWithHeartbeat(GPUShaderModule.prototype, 'getCompilationInfo');
globalTestConfig.testHeartbeatCallback = sendHeartbeat; globalTestConfig.testHeartbeatCallback = sendHeartbeat;
globalTestConfig.noRaceWithRejectOnTimeout = true; globalTestConfig.noRaceWithRejectOnTimeout = true;