foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-25 15:29:32 -05:00
Code Issues Packages 1 Wiki Activity

refactor(ext/webgpu): align error messages (#25719)

Browse source 
Aligns the error messages in the ext/webgpu folder to be in-line with
the Deno style guide.

https://github.com/denoland/deno/issues/25269
This commit is contained in:
Ian Bull 2024-09-19 00:14:54 -07:00 committed by GitHub
parent f460188e58
commit 486cb18fc5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
ext/webgpu/01_webgpu.js
View file

@ -175,7 +175,7 @@ function assertDevice(self, prefix, context) {
const deviceRid = device?.rid; const deviceRid = device?.rid;
if (deviceRid === undefined) { if (deviceRid === undefined) {
throw new DOMException( throw new DOMException(
`${prefix}: ${context} references an invalid or destroyed device.`, `${prefix}: ${context} references an invalid or destroyed device`,
"OperationError", "OperationError",
); );
} }
@ -196,7 +196,7 @@ function assertDeviceMatch(
const resourceDevice = assertDevice(resource, prefix, resourceContext); const resourceDevice = assertDevice(resource, prefix, resourceContext);
if (resourceDevice.rid !== self.rid) { if (resourceDevice.rid !== self.rid) {
throw new DOMException( throw new DOMException(
`${prefix}: ${resourceContext} belongs to a different device than ${selfContext}.`, `${prefix}: ${resourceContext} belongs to a different device than ${selfContext}`,
"OperationError", "OperationError",
); );
} }
@ -213,7 +213,7 @@ function assertResource(self, prefix, context) {
const rid = self[_rid]; const rid = self[_rid];
if (rid === undefined) { if (rid === undefined) {
throw new DOMException( throw new DOMException(
`${prefix}: ${context} an invalid or destroyed resource.`, `${prefix}: ${context} an invalid or destroyed resource`,
"OperationError", "OperationError",
); );
} }
@ -469,7 +469,7 @@ class GPUAdapter {
!SetPrototypeHas(this[_adapter].features[webidl.setlikeInner], feature) !SetPrototypeHas(this[_adapter].features[webidl.setlikeInner], feature)
) { ) {
throw new TypeError( throw new TypeError(
`${prefix}: requiredFeatures must be a subset of the adapter features.`, `${prefix}: requiredFeatures must be a subset of the adapter features`,
); );
} }
} }
@ -1819,12 +1819,12 @@ class GPUDevice extends EventTarget {
const prefix = "Failed to execute 'popErrorScope' on 'GPUDevice'"; const prefix = "Failed to execute 'popErrorScope' on 'GPUDevice'";
const device = assertDevice(this, prefix, "this"); const device = assertDevice(this, prefix, "this");
if (device.isLost) { if (device.isLost) {
throw new DOMException("Device has been lost.", "OperationError"); throw new DOMException("Device has been lost", "OperationError");
} }
const scope = ArrayPrototypePop(device.errorScopeStack); const scope = ArrayPrototypePop(device.errorScopeStack);
if (!scope) { if (!scope) {
throw new DOMException( throw new DOMException(
"There are no error scopes on the error scope stack.", "There are no error scopes on the error scope stack",
"OperationError", "OperationError",
); );
} }
@ -2195,25 +2195,25 @@ class GPUBuffer {
} }
if ((offset % 8) !== 0) { if ((offset % 8) !== 0) {
throw new DOMException( throw new DOMException(
`${prefix}: offset must be a multiple of 8.`, `${prefix}: offset must be a multiple of 8, received ${offset}`,
"OperationError", "OperationError",
); );
} }
if ((rangeSize % 4) !== 0) { if ((rangeSize % 4) !== 0) {
throw new DOMException( throw new DOMException(
`${prefix}: rangeSize must be a multiple of 4.`, `${prefix}: rangeSize must be a multiple of 4, received ${rangeSize}`,
"OperationError", "OperationError",
); );
} }
if ((offset + rangeSize) > this[_size]) { if ((offset + rangeSize) > this[_size]) {
throw new DOMException( throw new DOMException(
`${prefix}: offset + rangeSize must be less than or equal to buffer size.`, `${prefix}: offset + rangeSize must be less than or equal to buffer size`,
"OperationError", "OperationError",
); );
} }
if (this[_state] !== "unmapped") { if (this[_state] !== "unmapped") {
throw new DOMException( throw new DOMException(
`${prefix}: GPUBuffer is not currently unmapped.`, `${prefix}: GPUBuffer is not currently unmapped`,
"OperationError", "OperationError",
); );
} }
@ -2221,19 +2221,19 @@ class GPUBuffer {
const writeMode = (mode & 0x0002) === 0x0002; const writeMode = (mode & 0x0002) === 0x0002;
if ((readMode && writeMode) || (!readMode && !writeMode)) { if ((readMode && writeMode) || (!readMode && !writeMode)) {
throw new DOMException( throw new DOMException(
`${prefix}: exactly one of READ or WRITE map mode must be set.`, `${prefix}: exactly one of READ or WRITE map mode must be set`,
"OperationError", "OperationError",
); );
} }
if (readMode && !((this[_usage] && 0x0001) === 0x0001)) { if (readMode && !((this[_usage] && 0x0001) === 0x0001)) {
throw new DOMException( throw new DOMException(
`${prefix}: READ map mode not valid because buffer does not have MAP_READ usage.`, `${prefix}: READ map mode not valid because buffer does not have MAP_READ usage`,
"OperationError", "OperationError",
); );
} }
if (writeMode && !((this[_usage] && 0x0002) === 0x0002)) { if (writeMode && !((this[_usage] && 0x0002) === 0x0002)) {
throw new DOMException( throw new DOMException(
`${prefix}: WRITE map mode not valid because buffer does not have MAP_WRITE usage.`, `${prefix}: WRITE map mode not valid because buffer does not have MAP_WRITE usage`,
"OperationError", "OperationError",
); );
} }
@ -2280,7 +2280,7 @@ class GPUBuffer {
const mappedRanges = this[_mappedRanges]; const mappedRanges = this[_mappedRanges];
if (!mappedRanges) { if (!mappedRanges) {
throw new DOMException(`${prefix}: invalid state.`, "OperationError"); throw new DOMException(`${prefix}: invalid state`, "OperationError");
} }
for (let i = 0; i < mappedRanges.length; ++i) { for (let i = 0; i < mappedRanges.length; ++i) {
const { 0: buffer, 1: _rid, 2: start } = mappedRanges[i]; const { 0: buffer, 1: _rid, 2: start } = mappedRanges[i];
@ -2291,7 +2291,7 @@ class GPUBuffer {
(end >= offset && end < (offset + rangeSize)) (end >= offset && end < (offset + rangeSize))
) { ) {
throw new DOMException( throw new DOMException(
`${prefix}: requested buffer overlaps with another mapped range.`, `${prefix}: requested buffer overlaps with another mapped range`,
"OperationError", "OperationError",
); );
} }
@ -2317,14 +2317,14 @@ class GPUBuffer {
const bufferRid = assertResource(this, prefix, "this"); const bufferRid = assertResource(this, prefix, "this");
if (this[_state] === "unmapped" || this[_state] === "destroyed") { if (this[_state] === "unmapped" || this[_state] === "destroyed") {
throw new DOMException( throw new DOMException(
`${prefix}: buffer is not ready to be unmapped.`, `${prefix}: buffer is not ready to be unmapped`,
"OperationError", "OperationError",
); );
} }
if (this[_state] === "pending") { if (this[_state] === "pending") {
// TODO(lucacasonato): this is not spec compliant. // TODO(lucacasonato): this is not spec compliant.
throw new DOMException( throw new DOMException(
`${prefix}: can not unmap while mapping. This is a Deno limitation.`, `${prefix}: can not unmap while mapping, this is a Deno limitation`,
"OperationError", "OperationError",
); );
} else if ( } else if (
@ -2338,7 +2338,7 @@ class GPUBuffer {
const mapMode = this[_mapMode]; const mapMode = this[_mapMode];
if (mapMode === undefined) { if (mapMode === undefined) {
throw new DOMException( throw new DOMException(
`${prefix}: invalid state.`, `${prefix}: invalid state`,
"OperationError", "OperationError",
); );
} }
@ -2349,7 +2349,7 @@ class GPUBuffer {
const mappedRanges = this[_mappedRanges]; const mappedRanges = this[_mappedRanges];
if (!mappedRanges) { if (!mappedRanges) {
throw new DOMException(`${prefix}: invalid state.`, "OperationError"); throw new DOMException(`${prefix}: invalid state`, "OperationError");
} }
for (let i = 0; i < mappedRanges.length; ++i) { for (let i = 0; i < mappedRanges.length; ++i) {
const { 0: buffer, 1: mappedRid } = mappedRanges[i]; const { 0: buffer, 1: mappedRid } = mappedRanges[i];
@ -5540,7 +5540,7 @@ webidl.converters["GPUExtent3D"] = (V, opts) => {
if (V.length < min || V.length > max) { if (V.length < min || V.length > max) {
throw webidl.makeException( throw webidl.makeException(
TypeError, TypeError,
`A sequence of number used as a GPUExtent3D must have between ${min} and ${max} elements.`, `A sequence of number used as a GPUExtent3D must have between ${min} and ${max} elements, received ${V.length} elements`,
opts, opts,
); );
} }
@ -5550,7 +5550,7 @@ webidl.converters["GPUExtent3D"] = (V, opts) => {
} }
throw webidl.makeException( throw webidl.makeException(
TypeError, TypeError,
"can not be converted to sequence<GPUIntegerCoordinate> or GPUExtent3DDict.", "can not be converted to sequence<GPUIntegerCoordinate> or GPUExtent3DDict",
opts, opts,
); );
}; };
@ -6884,7 +6884,7 @@ webidl.converters["GPUOrigin3D"] = (V, opts) => {
if (V.length > length) { if (V.length > length) {
throw webidl.makeException( throw webidl.makeException(
TypeError, TypeError,
`A sequence of number used as a GPUOrigin3D must have at most ${length} elements.`, `A sequence of number used as a GPUOrigin3D must have at most ${length} elements, received ${V.length} elements`,
opts, opts,
); );
} }
@ -6894,7 +6894,7 @@ webidl.converters["GPUOrigin3D"] = (V, opts) => {
} }
throw webidl.makeException( throw webidl.makeException(
TypeError, TypeError,
"can not be converted to sequence<GPUIntegerCoordinate> or GPUOrigin3DDict.", "can not be converted to sequence<GPUIntegerCoordinate> or GPUOrigin3DDict",
opts, opts,
); );
}; };
@ -6961,7 +6961,7 @@ webidl.converters["GPUOrigin2D"] = (V, opts) => {
if (V.length > length) { if (V.length > length) {
throw webidl.makeException( throw webidl.makeException(
TypeError, TypeError,
`A sequence of number used as a GPUOrigin2D must have at most ${length} elements.`, `A sequence of number used as a GPUOrigin2D must have at most ${length} elements, received ${V.length} elements`,
opts, opts,
); );
} }
@ -6971,7 +6971,7 @@ webidl.converters["GPUOrigin2D"] = (V, opts) => {
} }
throw webidl.makeException( throw webidl.makeException(
TypeError, TypeError,
"can not be converted to sequence<GPUIntegerCoordinate> or GPUOrigin2DDict.", "can not be converted to sequence<GPUIntegerCoordinate> or GPUOrigin2DDict",
opts, opts,
); );
}; };
@ -7055,7 +7055,7 @@ webidl.converters["GPUColor"] = (V, opts) => {
if (V.length !== length) { if (V.length !== length) {
throw webidl.makeException( throw webidl.makeException(
TypeError, TypeError,
`A sequence of number used as a GPUColor must have exactly ${length} elements.`, `A sequence of number used as a GPUColor must have exactly ${length} elements, received ${V.length} elements`,
opts, opts,
); );
} }
@ -7065,7 +7065,7 @@ webidl.converters["GPUColor"] = (V, opts) => {
} }
throw webidl.makeException( throw webidl.makeException(
TypeError, TypeError,
"can not be converted to sequence<double> or GPUColorDict.", "can not be converted to sequence<double> or GPUColorDict",
opts, opts,
); );
}; };

4
ext/webgpu/02_surface.js
View file

@ -92,7 +92,7 @@ class GPUCanvasContext {
"Failed to execute 'getCurrentTexture' on 'GPUCanvasContext'"; "Failed to execute 'getCurrentTexture' on 'GPUCanvasContext'";
if (this[_configuration] === null) { if (this[_configuration] === null) {
throw new DOMException("context is not configured.", "InvalidStateError"); throw new DOMException("Context is not configured", "InvalidStateError");
} }
const { createGPUTexture, assertDevice } = loadWebGPU(); const { createGPUTexture, assertDevice } = loadWebGPU();
@ -179,7 +179,7 @@ class UnsafeWindowSurface {
getContext(context) { getContext(context) {
if (context !== "webgpu") { if (context !== "webgpu") {
throw new TypeError("Only 'webgpu' context is supported."); throw new TypeError("Only 'webgpu' context is supported");
} }
this.#ctx = createCanvasContext({ surfaceRid: this.#surfaceRid }); this.#ctx = createCanvasContext({ surfaceRid: this.#surfaceRid });
return this.#ctx; return this.#ctx;

6
tests/unit/webgpu_test.ts
View file

@ -271,7 +271,7 @@ Deno.test({
const invalidSize = [0, 0, 0]; const invalidSize = [0, 0, 0];
const msgIncludes = const msgIncludes =
"A sequence of number used as a GPUColor must have exactly 4 elements."; "A sequence of number used as a GPUColor must have exactly 4 elements, received 3 elements";
// validate the argument of descriptor.colorAttachments[@@iterator].clearValue property's length of GPUCommandEncoder.beginRenderPass when its a sequence // validate the argument of descriptor.colorAttachments[@@iterator].clearValue property's length of GPUCommandEncoder.beginRenderPass when its a sequence
// https://www.w3.org/TR/2024/WD-webgpu-20240409/#dom-gpucommandencoder-beginrenderpass // https://www.w3.org/TR/2024/WD-webgpu-20240409/#dom-gpucommandencoder-beginrenderpass
@ -337,7 +337,7 @@ Deno.test({
const overSize = [256, 256, 1, 1]; const overSize = [256, 256, 1, 1];
const msgIncludes = const msgIncludes =
"A sequence of number used as a GPUExtent3D must have between 1 and 3 elements."; "A sequence of number used as a GPUExtent3D must have between 1 and 3 elements";
// validate the argument of descriptor.size property's length of GPUDevice.createTexture when its a sequence // validate the argument of descriptor.size property's length of GPUDevice.createTexture when its a sequence
// https://www.w3.org/TR/2024/WD-webgpu-20240409/#dom-gpudevice-createtexture // https://www.w3.org/TR/2024/WD-webgpu-20240409/#dom-gpudevice-createtexture
@ -437,7 +437,7 @@ Deno.test({
const overSize = [256, 256, 1, 1]; const overSize = [256, 256, 1, 1];
const msgIncludes = const msgIncludes =
"A sequence of number used as a GPUOrigin3D must have at most 3 elements."; "A sequence of number used as a GPUOrigin3D must have at most 3 elements, received 4 elements";
// validate the argument of destination.origin property's length of GPUCommandEncoder.copyBufferToTexture when its a sequence // validate the argument of destination.origin property's length of GPUCommandEncoder.copyBufferToTexture when its a sequence
// https://www.w3.org/TR/2024/WD-webgpu-20240409/#dom-gpucommandencoder-copybuffertotexture // https://www.w3.org/TR/2024/WD-webgpu-20240409/#dom-gpucommandencoder-copybuffertotexture