-
Notifications
You must be signed in to change notification settings - Fork 959
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into webxr
- Loading branch information
Showing
23 changed files
with
714 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. | ||
|
|
||
| // @ts-check | ||
| /// <reference path="../../core/lib.deno_core.d.ts" /> | ||
| /// <reference path="../web/internal.d.ts" /> | ||
| /// <reference path="../web/lib.deno_web.d.ts" /> | ||
| /// <reference path="./lib.deno_webgpu.d.ts" /> | ||
|
|
||
| "use strict"; | ||
|
|
||
| ((window) => { | ||
| const core = window.Deno.core; | ||
| const ops = core.ops; | ||
| const webidl = window.__bootstrap.webidl; | ||
| const { Symbol } = window.__bootstrap.primordials; | ||
| const { _device, assertDevice, createGPUTexture } = window.__bootstrap.webgpu; | ||
|
|
||
| const _surfaceRid = Symbol("[[surfaceRid]]"); | ||
| const _configuration = Symbol("[[configuration]]"); | ||
| const _canvas = Symbol("[[canvas]]"); | ||
| const _currentTexture = Symbol("[[currentTexture]]"); | ||
| class GPUCanvasContext { | ||
| /** @type {number} */ | ||
| [_surfaceRid]; | ||
| /** @type {InnerGPUDevice} */ | ||
| [_device]; | ||
| [_configuration]; | ||
| [_canvas]; | ||
| /** @type {GPUTexture | undefined} */ | ||
| [_currentTexture]; | ||
|
|
||
| get canvas() { | ||
| webidl.assertBranded(this, GPUCanvasContextPrototype); | ||
| return this[_canvas]; | ||
| } | ||
|
|
||
| constructor() { | ||
| webidl.illegalConstructor(); | ||
| } | ||
|
|
||
| configure(configuration) { | ||
| webidl.assertBranded(this, GPUCanvasContextPrototype); | ||
| const prefix = "Failed to execute 'configure' on 'GPUCanvasContext'"; | ||
| webidl.requiredArguments(arguments.length, 1, { prefix }); | ||
| configuration = webidl.converters.GPUCanvasConfiguration(configuration, { | ||
| prefix, | ||
| context: "Argument 1", | ||
| }); | ||
|
|
||
| this[_device] = configuration.device[_device]; | ||
| this[_configuration] = configuration; | ||
| const device = assertDevice(this, { prefix, context: "configuration.device" }); | ||
|
|
||
| const { err } = ops.op_webgpu_surface_configure({ | ||
| surfaceRid: this[_surfaceRid], | ||
| deviceRid: device.rid, | ||
| format: configuration.format, | ||
| usage: configuration.usage, | ||
| width: configuration.width, | ||
| height: configuration.height, | ||
| alphaMode: configuration.alphaMode, | ||
| }); | ||
|
|
||
| device.pushError(err); | ||
| } | ||
|
|
||
| unconfigure() { | ||
| webidl.assertBranded(this, GPUCanvasContextPrototype); | ||
|
|
||
| this[_configuration] = null; | ||
| this[_device] = null; | ||
| } | ||
|
|
||
| getCurrentTexture() { | ||
| webidl.assertBranded(this, GPUCanvasContextPrototype); | ||
| const prefix = "Failed to execute 'getCurrentTexture' on 'GPUCanvasContext'"; | ||
|
|
||
| if (this[_configuration] === null) { | ||
| throw new DOMException("context is not configured.", "InvalidStateError"); | ||
| } | ||
|
|
||
| const device = assertDevice(this, { prefix, context: "this" }); | ||
|
|
||
| if (this[_currentTexture]) { | ||
| return this[_currentTexture]; | ||
| } | ||
|
|
||
| const { rid } = ops.op_webgpu_surface_get_current_texture(device.rid, this[_surfaceRid]); | ||
|
|
||
| const texture = createGPUTexture( | ||
| { | ||
| size: { | ||
| width: this[_configuration].width, | ||
| height: this[_configuration].height, | ||
| depthOrArrayLayers: 1, | ||
| }, | ||
| mipLevelCount: 1, | ||
| sampleCount: 1, | ||
| dimension: "2d", | ||
| format: this[_configuration].format, | ||
| usage: this[_configuration].usage, | ||
| }, | ||
| device, | ||
| rid, | ||
| ); | ||
| device.trackResource(texture); | ||
| this[_currentTexture] = texture; | ||
| return texture; | ||
| } | ||
|
|
||
| // Extended from spec. Required to present the texture; browser don't need this. | ||
| present() { | ||
| webidl.assertBranded(this, GPUCanvasContextPrototype); | ||
| const prefix = "Failed to execute 'present' on 'GPUCanvasContext'"; | ||
| const device = assertDevice(this[_currentTexture], { prefix, context: "this" }); | ||
| ops.op_webgpu_surface_present(device.rid, this[_surfaceRid]); | ||
| this[_currentTexture].destroy(); | ||
| this[_currentTexture] = undefined; | ||
| } | ||
| } | ||
| const GPUCanvasContextPrototype = GPUCanvasContext.prototype; | ||
|
|
||
| function createCanvasContext(options) { | ||
| const canvasContext = webidl.createBranded(GPUCanvasContext); | ||
| canvasContext[_surfaceRid] = options.surfaceRid; | ||
| canvasContext[_canvas] = options.canvas; | ||
| return canvasContext; | ||
| } | ||
|
|
||
| window.__bootstrap.webgpu = { | ||
| ...window.__bootstrap.webgpu, | ||
| GPUCanvasContext, | ||
| createCanvasContext, | ||
| }; | ||
| })(this); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. | ||
|
|
||
| // @ts-check | ||
| /// <reference path="../../core/lib.deno_core.d.ts" /> | ||
| /// <reference path="../web/internal.d.ts" /> | ||
| /// <reference path="../web/lib.deno_web.d.ts" /> | ||
| /// <reference path="./lib.deno_webgpu.d.ts" /> | ||
|
|
||
| "use strict"; | ||
|
|
||
| ((window) => { | ||
| const webidl = window.__bootstrap.webidl; | ||
| const { GPUTextureUsage } = window.__bootstrap.webgpu; | ||
|
|
||
| // ENUM: GPUCanvasAlphaMode | ||
| webidl.converters["GPUCanvasAlphaMode"] = webidl.createEnumConverter( | ||
| "GPUCanvasAlphaMode", | ||
| [ | ||
| "opaque", | ||
| "premultiplied", | ||
| ], | ||
| ); | ||
|
|
||
| // NON-SPEC: ENUM: GPUPresentMode | ||
| webidl.converters["GPUPresentMode"] = webidl.createEnumConverter( | ||
| "GPUPresentMode", | ||
| [ | ||
| "autoVsync", | ||
| "autoNoVsync", | ||
| "fifo", | ||
| "fifoRelaxed", | ||
| "immediate", | ||
| "mailbox", | ||
| ], | ||
| ); | ||
|
|
||
| // DICT: GPUCanvasConfiguration | ||
| const dictMembersGPUCanvasConfiguration = [ | ||
| { key: "device", converter: webidl.converters.GPUDevice, required: true }, | ||
| { | ||
| key: "format", | ||
| converter: webidl.converters.GPUTextureFormat, | ||
| required: true, | ||
| }, | ||
| { | ||
| key: "usage", | ||
| converter: webidl.converters["GPUTextureUsageFlags"], | ||
| defaultValue: GPUTextureUsage.RENDER_ATTACHMENT, | ||
| }, | ||
| { | ||
| key: "alphaMode", | ||
| converter: webidl.converters["GPUCanvasAlphaMode"], | ||
| defaultValue: "opaque", | ||
| }, | ||
|
|
||
| // Extended from spec | ||
| { | ||
| key: "presentMode", | ||
| converter: webidl.converters["GPUPresentMode"], | ||
| }, | ||
| { | ||
| key: "width", | ||
| converter: webidl.converters["long"], | ||
| required: true, | ||
| }, | ||
| { | ||
| key: "height", | ||
| converter: webidl.converters["long"], | ||
| required: true, | ||
| }, | ||
| ]; | ||
| webidl.converters["GPUCanvasConfiguration"] = webidl | ||
| .createDictionaryConverter( | ||
| "GPUCanvasConfiguration", | ||
| dictMembersGPUCanvasConfiguration, | ||
| ); | ||
| })(this); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.