dawn/node: Roll to latest IDL

Bug: dawn:1123
Change-Id: I430d6b980dc34e37578fc26d3e0e126e75e11d97
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88667
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Auto-Submit: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton 2022-05-03 20:02:53 +00:00 committed by Dawn LUCI CQ
parent d7a15d11b4
commit 2829922ab0
41 changed files with 110 additions and 102 deletions

2
DEPS
View File

@ -167,7 +167,7 @@ deps = {
'condition': 'dawn_node',
},
'third_party/gpuweb': {
'url': '{github_git}/gpuweb/gpuweb.git@881403b5fda2d9ac9ffc5daa24e34738205bf155',
'url': '{github_git}/gpuweb/gpuweb.git@16df823c91c9045b7cdf9bd0f2c0ef6d43ac95e7',
'condition': 'dawn_node',
},
'third_party/gpuweb-cts': {

View File

@ -1184,6 +1184,20 @@ bool Converter::Convert(wgpu::FilterMode& out, const interop::GPUFilterMode& in)
return false;
}
bool Converter::Convert(wgpu::FilterMode& out, const interop::GPUMipmapFilterMode& in) {
out = wgpu::FilterMode::Nearest;
switch (in) {
case interop::GPUMipmapFilterMode::kNearest:
out = wgpu::FilterMode::Nearest;
return true;
case interop::GPUMipmapFilterMode::kLinear:
out = wgpu::FilterMode::Linear;
return true;
}
Napi::Error::New(env, "invalid value for GPUFilterMode").ThrowAsJavaScriptException();
return false;
}
bool Converter::Convert(wgpu::ComputePipelineDescriptor& out,
const interop::GPUComputePipelineDescriptor& in) {
return Convert(out.label, in.label) && //

View File

@ -235,6 +235,8 @@ class Converter {
[[nodiscard]] bool Convert(wgpu::FilterMode& out, const interop::GPUFilterMode& in);
[[nodiscard]] bool Convert(wgpu::FilterMode& out, const interop::GPUMipmapFilterMode& in);
[[nodiscard]] bool Convert(wgpu::ComputePipelineDescriptor& out,
const interop::GPUComputePipelineDescriptor& in);

View File

@ -25,11 +25,11 @@ namespace wgpu::binding {
////////////////////////////////////////////////////////////////////////////////
GPUBindGroup::GPUBindGroup(wgpu::BindGroup group) : group_(std::move(group)) {}
std::variant<std::string, interop::UndefinedType> GPUBindGroup::getLabel(Napi::Env) {
std::string GPUBindGroup::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUBindGroup::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPUBindGroup::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -33,8 +33,8 @@ class GPUBindGroup final : public interop::GPUBindGroup {
inline operator const wgpu::BindGroup&() const { return group_; }
// interop::GPUBindGroup interface compliance
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::BindGroup group_;

View File

@ -25,12 +25,11 @@ namespace wgpu::binding {
////////////////////////////////////////////////////////////////////////////////
GPUBindGroupLayout::GPUBindGroupLayout(wgpu::BindGroupLayout layout) : layout_(std::move(layout)) {}
std::variant<std::string, interop::UndefinedType> GPUBindGroupLayout::getLabel(Napi::Env) {
std::string GPUBindGroupLayout::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUBindGroupLayout::setLabel(Napi::Env,
std::variant<std::string, interop::UndefinedType> value) {
void GPUBindGroupLayout::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -34,8 +34,8 @@ class GPUBindGroupLayout final : public interop::GPUBindGroupLayout {
inline operator const wgpu::BindGroupLayout&() const { return layout_; }
// interop::GPUBindGroupLayout interface compliance
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::BindGroupLayout layout_;

View File

@ -169,11 +169,11 @@ void GPUBuffer::DetachMappings() {
mapped_.clear();
}
std::variant<std::string, interop::UndefinedType> GPUBuffer::getLabel(Napi::Env) {
std::string GPUBuffer::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUBuffer::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPUBuffer::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -51,8 +51,8 @@ class GPUBuffer final : public interop::GPUBuffer {
std::optional<interop::GPUSize64> size) override;
void unmap(Napi::Env) override;
void destroy(Napi::Env) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
void DetachMappings();

View File

@ -26,12 +26,11 @@ namespace wgpu::binding {
GPUCommandBuffer::GPUCommandBuffer(wgpu::CommandBuffer cmd_buf) : cmd_buf_(std::move(cmd_buf)) {}
std::variant<std::string, interop::UndefinedType> GPUCommandBuffer::getLabel(Napi::Env) {
std::string GPUCommandBuffer::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUCommandBuffer::setLabel(Napi::Env,
std::variant<std::string, interop::UndefinedType> value) {
void GPUCommandBuffer::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -34,8 +34,8 @@ class GPUCommandBuffer final : public interop::GPUCommandBuffer {
inline operator const wgpu::CommandBuffer&() const { return cmd_buf_; }
// interop::GPUCommandBuffer interface compliance
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::CommandBuffer cmd_buf_;

View File

@ -205,12 +205,11 @@ interop::Interface<interop::GPUCommandBuffer> GPUCommandEncoder::finish(
return interop::GPUCommandBuffer::Create<GPUCommandBuffer>(env, enc_.Finish(&desc));
}
std::variant<std::string, interop::UndefinedType> GPUCommandEncoder::getLabel(Napi::Env) {
std::string GPUCommandEncoder::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUCommandEncoder::setLabel(Napi::Env,
std::variant<std::string, interop::UndefinedType> value) {
void GPUCommandEncoder::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -74,8 +74,8 @@ class GPUCommandEncoder final : public interop::GPUCommandEncoder {
interop::Interface<interop::GPUCommandBuffer> finish(
Napi::Env env,
interop::GPUCommandBufferDescriptor descriptor) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::CommandEncoder enc_;

View File

@ -35,17 +35,18 @@ void GPUComputePassEncoder::setPipeline(Napi::Env,
enc_.SetPipeline(*pipeline.As<GPUComputePipeline>());
}
void GPUComputePassEncoder::dispatch(Napi::Env,
interop::GPUSize32 workgroupCountX,
interop::GPUSize32 workgroupCountY,
interop::GPUSize32 workgroupCountZ) {
enc_.Dispatch(workgroupCountX, workgroupCountY, workgroupCountZ);
void GPUComputePassEncoder::dispatchWorkgroups(Napi::Env,
interop::GPUSize32 workgroupCountX,
interop::GPUSize32 workgroupCountY,
interop::GPUSize32 workgroupCountZ) {
enc_.DispatchWorkgroups(workgroupCountX, workgroupCountY, workgroupCountZ);
}
void GPUComputePassEncoder::dispatchIndirect(Napi::Env,
interop::Interface<interop::GPUBuffer> indirectBuffer,
interop::GPUSize64 indirectOffset) {
enc_.DispatchIndirect(*indirectBuffer.As<GPUBuffer>(), indirectOffset);
void GPUComputePassEncoder::dispatchWorkgroupsIndirect(
Napi::Env,
interop::Interface<interop::GPUBuffer> indirectBuffer,
interop::GPUSize64 indirectOffset) {
enc_.DispatchWorkgroupsIndirect(*indirectBuffer.As<GPUBuffer>(), indirectOffset);
}
void GPUComputePassEncoder::end(Napi::Env) {
@ -112,12 +113,11 @@ void GPUComputePassEncoder::insertDebugMarker(Napi::Env, std::string markerLabel
enc_.InsertDebugMarker(markerLabel.c_str());
}
std::variant<std::string, interop::UndefinedType> GPUComputePassEncoder::getLabel(Napi::Env) {
std::string GPUComputePassEncoder::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUComputePassEncoder::setLabel(Napi::Env,
std::variant<std::string, interop::UndefinedType> value) {
void GPUComputePassEncoder::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -36,13 +36,13 @@ class GPUComputePassEncoder final : public interop::GPUComputePassEncoder {
// interop::GPUComputePassEncoder interface compliance
void setPipeline(Napi::Env, interop::Interface<interop::GPUComputePipeline> pipeline) override;
void dispatch(Napi::Env,
interop::GPUSize32 workgroupCountX,
interop::GPUSize32 workgroupCountY,
interop::GPUSize32 workgroupCountZ) override;
void dispatchIndirect(Napi::Env,
interop::Interface<interop::GPUBuffer> indirectBuffer,
interop::GPUSize64 indirectOffset) override;
void dispatchWorkgroups(Napi::Env,
interop::GPUSize32 workgroupCountX,
interop::GPUSize32 workgroupCountY,
interop::GPUSize32 workgroupCountZ) override;
void dispatchWorkgroupsIndirect(Napi::Env,
interop::Interface<interop::GPUBuffer> indirectBuffer,
interop::GPUSize64 indirectOffset) override;
void end(Napi::Env) override;
void setBindGroup(Napi::Env,
interop::GPUIndex32 index,
@ -57,8 +57,8 @@ class GPUComputePassEncoder final : public interop::GPUComputePassEncoder {
void pushDebugGroup(Napi::Env, std::string groupLabel) override;
void popDebugGroup(Napi::Env) override;
void insertDebugMarker(Napi::Env, std::string markerLabel) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::ComputePassEncoder enc_;

View File

@ -35,12 +35,11 @@ interop::Interface<interop::GPUBindGroupLayout> GPUComputePipeline::getBindGroup
env, pipeline_.GetBindGroupLayout(index));
}
std::variant<std::string, interop::UndefinedType> GPUComputePipeline::getLabel(Napi::Env) {
std::string GPUComputePipeline::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUComputePipeline::setLabel(Napi::Env,
std::variant<std::string, interop::UndefinedType> value) {
void GPUComputePipeline::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -36,8 +36,8 @@ class GPUComputePipeline final : public interop::GPUComputePipeline {
// interop::GPUComputePipeline interface compliance
interop::Interface<interop::GPUBindGroupLayout> getBindGroupLayout(Napi::Env,
uint32_t index) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::ComputePipeline pipeline_;

View File

@ -474,11 +474,11 @@ interop::Promise<std::optional<interop::GPUError>> GPUDevice::popErrorScope(Napi
return promise;
}
std::variant<std::string, interop::UndefinedType> GPUDevice::getLabel(Napi::Env) {
std::string GPUDevice::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUDevice::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPUDevice::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -84,8 +84,8 @@ class GPUDevice final : public interop::GPUDevice {
Napi::Env env) override;
void pushErrorScope(Napi::Env, interop::GPUErrorFilter filter) override;
interop::Promise<std::optional<interop::GPUError>> popErrorScope(Napi::Env env) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
interop::Interface<interop::EventHandler> getOnuncapturederror(Napi::Env) override;
void setOnuncapturederror(Napi::Env, interop::Interface<interop::EventHandler> value) override;
void addEventListener(

View File

@ -25,12 +25,11 @@ namespace wgpu::binding {
////////////////////////////////////////////////////////////////////////////////
GPUPipelineLayout::GPUPipelineLayout(wgpu::PipelineLayout layout) : layout_(std::move(layout)) {}
std::variant<std::string, interop::UndefinedType> GPUPipelineLayout::getLabel(Napi::Env) {
std::string GPUPipelineLayout::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUPipelineLayout::setLabel(Napi::Env,
std::variant<std::string, interop::UndefinedType> value) {
void GPUPipelineLayout::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -34,8 +34,8 @@ class GPUPipelineLayout final : public interop::GPUPipelineLayout {
inline operator const wgpu::PipelineLayout&() const { return layout_; }
// interop::GPUPipelineLayout interface compliance
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::PipelineLayout layout_;

View File

@ -29,11 +29,11 @@ void GPUQuerySet::destroy(Napi::Env) {
query_set_.Destroy();
}
std::variant<std::string, interop::UndefinedType> GPUQuerySet::getLabel(Napi::Env) {
std::string GPUQuerySet::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUQuerySet::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPUQuerySet::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -34,8 +34,8 @@ class GPUQuerySet final : public interop::GPUQuerySet {
// interop::GPUQuerySet interface compliance
void destroy(Napi::Env) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::QuerySet query_set_;

View File

@ -148,11 +148,11 @@ void GPUQueue::copyExternalImageToTexture(Napi::Env,
UNIMPLEMENTED();
}
std::variant<std::string, interop::UndefinedType> GPUQueue::getLabel(Napi::Env) {
std::string GPUQueue::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUQueue::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPUQueue::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -51,8 +51,8 @@ class GPUQueue final : public interop::GPUQueue {
interop::GPUImageCopyExternalImage source,
interop::GPUImageCopyTextureTagged destination,
interop::GPUExtent3D copySize) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::Queue queue_;

View File

@ -28,11 +28,11 @@ namespace wgpu::binding {
////////////////////////////////////////////////////////////////////////////////
GPURenderBundle::GPURenderBundle(wgpu::RenderBundle bundle) : bundle_(std::move(bundle)) {}
std::variant<std::string, interop::UndefinedType> GPURenderBundle::getLabel(Napi::Env) {
std::string GPURenderBundle::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPURenderBundle::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPURenderBundle::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -34,8 +34,8 @@ class GPURenderBundle final : public interop::GPURenderBundle {
inline operator const wgpu::RenderBundle&() const { return bundle_; }
// interop::GPURenderBundle interface compliance
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::RenderBundle bundle_;

View File

@ -181,12 +181,11 @@ void GPURenderBundleEncoder::drawIndexedIndirect(
enc_.DrawIndexedIndirect(b, o);
}
std::variant<std::string, interop::UndefinedType> GPURenderBundleEncoder::getLabel(Napi::Env) {
std::string GPURenderBundleEncoder::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPURenderBundleEncoder::setLabel(Napi::Env,
std::variant<std::string, interop::UndefinedType> value) {
void GPURenderBundleEncoder::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -76,8 +76,8 @@ class GPURenderBundleEncoder final : public interop::GPURenderBundleEncoder {
void drawIndexedIndirect(Napi::Env,
interop::Interface<interop::GPUBuffer> indirectBuffer,
interop::GPUSize64 indirectOffset) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::RenderBundleEncoder enc_;

View File

@ -241,12 +241,11 @@ void GPURenderPassEncoder::drawIndexedIndirect(
enc_.DrawIndexedIndirect(b, o);
}
std::variant<std::string, interop::UndefinedType> GPURenderPassEncoder::getLabel(Napi::Env) {
std::string GPURenderPassEncoder::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPURenderPassEncoder::setLabel(Napi::Env,
std::variant<std::string, interop::UndefinedType> value) {
void GPURenderPassEncoder::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -95,8 +95,8 @@ class GPURenderPassEncoder final : public interop::GPURenderPassEncoder {
void drawIndexedIndirect(Napi::Env,
interop::Interface<interop::GPUBuffer> indirectBuffer,
interop::GPUSize64 indirectOffset) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::RenderPassEncoder enc_;

View File

@ -35,12 +35,11 @@ interop::Interface<interop::GPUBindGroupLayout> GPURenderPipeline::getBindGroupL
env, pipeline_.GetBindGroupLayout(index));
}
std::variant<std::string, interop::UndefinedType> GPURenderPipeline::getLabel(Napi::Env) {
std::string GPURenderPipeline::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPURenderPipeline::setLabel(Napi::Env,
std::variant<std::string, interop::UndefinedType> value) {
void GPURenderPipeline::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -36,8 +36,8 @@ class GPURenderPipeline final : public interop::GPURenderPipeline {
// interop::GPURenderPipeline interface compliance
interop::Interface<interop::GPUBindGroupLayout> getBindGroupLayout(Napi::Env,
uint32_t index) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::RenderPipeline pipeline_;

View File

@ -26,11 +26,11 @@ namespace wgpu::binding {
////////////////////////////////////////////////////////////////////////////////
GPUSampler::GPUSampler(wgpu::Sampler sampler) : sampler_(std::move(sampler)) {}
std::variant<std::string, interop::UndefinedType> GPUSampler::getLabel(Napi::Env) {
std::string GPUSampler::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUSampler::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPUSampler::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -32,8 +32,8 @@ class GPUSampler final : public interop::GPUSampler {
inline operator const wgpu::Sampler&() const { return sampler_; }
// interop::GPUSampler interface compliance
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::Sampler sampler_;

View File

@ -104,11 +104,11 @@ interop::Promise<interop::Interface<interop::GPUCompilationInfo>> GPUShaderModul
return promise;
}
std::variant<std::string, interop::UndefinedType> GPUShaderModule::getLabel(Napi::Env) {
std::string GPUShaderModule::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUShaderModule::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPUShaderModule::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -38,8 +38,8 @@ class GPUShaderModule final : public interop::GPUShaderModule {
// interop::GPUShaderModule interface compliance
interop::Promise<interop::Interface<interop::GPUCompilationInfo>> compilationInfo(
Napi::Env) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::ShaderModule shader_;

View File

@ -54,11 +54,11 @@ void GPUTexture::destroy(Napi::Env) {
texture_.Destroy();
}
std::variant<std::string, interop::UndefinedType> GPUTexture::getLabel(Napi::Env) {
std::string GPUTexture::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUTexture::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPUTexture::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -37,8 +37,8 @@ class GPUTexture final : public interop::GPUTexture {
Napi::Env,
interop::GPUTextureViewDescriptor descriptor) override;
void destroy(Napi::Env) override;
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::Texture texture_;

View File

@ -25,11 +25,11 @@ namespace wgpu::binding {
////////////////////////////////////////////////////////////////////////////////
GPUTextureView::GPUTextureView(wgpu::TextureView view) : view_(std::move(view)) {}
std::variant<std::string, interop::UndefinedType> GPUTextureView::getLabel(Napi::Env) {
std::string GPUTextureView::getLabel(Napi::Env) {
UNIMPLEMENTED();
}
void GPUTextureView::setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) {
void GPUTextureView::setLabel(Napi::Env, std::string value) {
UNIMPLEMENTED();
}

View File

@ -34,8 +34,8 @@ class GPUTextureView final : public interop::GPUTextureView {
inline operator const wgpu::TextureView&() const { return view_; }
// interop::GPUTextureView interface compliance
std::variant<std::string, interop::UndefinedType> getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::variant<std::string, interop::UndefinedType> value) override;
std::string getLabel(Napi::Env) override;
void setLabel(Napi::Env, std::string value) override;
private:
wgpu::TextureView view_;