From a16c11c5d10052c688ba4c2eca09fd1a225e395a Mon Sep 17 00:00:00 2001 From: Leo Kettmeir Date: Mon, 20 Feb 2023 17:48:02 +0100 Subject: refactor: move webgpu files to ext root (#17832) Required for #17826 --- ext/webgpu/src/queue.rs | 129 ------------------------------------------------ 1 file changed, 129 deletions(-) delete mode 100644 ext/webgpu/src/queue.rs (limited to 'ext/webgpu/src/queue.rs') diff --git a/ext/webgpu/src/queue.rs b/ext/webgpu/src/queue.rs deleted file mode 100644 index dd78899e3..000000000 --- a/ext/webgpu/src/queue.rs +++ /dev/null @@ -1,129 +0,0 @@ -// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. - -use std::num::NonZeroU32; - -use deno_core::error::AnyError; -use deno_core::op; -use deno_core::OpState; -use deno_core::ResourceId; -use deno_core::ZeroCopyBuf; -use serde::Deserialize; - -use super::error::WebGpuResult; - -type WebGpuQueue = super::WebGpuDevice; - -#[op] -pub fn op_webgpu_queue_submit( - state: &mut OpState, - queue_rid: ResourceId, - command_buffers: Vec, -) -> Result { - let instance = state.borrow::(); - let queue_resource = state.resource_table.get::(queue_rid)?; - let queue = queue_resource.0; - - let ids = command_buffers - .iter() - .map(|rid| { - let buffer_resource = - state - .resource_table - .get::(*rid)?; - Ok(buffer_resource.0) - }) - .collect::, AnyError>>()?; - - let maybe_err = - gfx_select!(queue => instance.queue_submit(queue, &ids)).err(); - - for rid in command_buffers { - state.resource_table.close(rid)?; - } - - Ok(WebGpuResult::maybe_err(maybe_err)) -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct GpuImageDataLayout { - offset: u64, - bytes_per_row: Option, - rows_per_image: Option, -} - -impl From for wgpu_types::ImageDataLayout { - fn from(layout: GpuImageDataLayout) -> Self { - wgpu_types::ImageDataLayout { - offset: layout.offset, - bytes_per_row: NonZeroU32::new(layout.bytes_per_row.unwrap_or(0)), - rows_per_image: NonZeroU32::new(layout.rows_per_image.unwrap_or(0)), - } - } -} - -#[op] -pub fn op_webgpu_write_buffer( - state: &mut OpState, - queue_rid: ResourceId, - buffer: ResourceId, - buffer_offset: u64, - data_offset: usize, - size: Option, - buf: ZeroCopyBuf, -) -> Result { - let instance = state.borrow::(); - let buffer_resource = state - .resource_table - .get::(buffer)?; - let buffer = buffer_resource.0; - let queue_resource = state.resource_table.get::(queue_rid)?; - let queue = queue_resource.0; - - let data = match size { - Some(size) => &buf[data_offset..(data_offset + size)], - None => &buf[data_offset..], - }; - let maybe_err = gfx_select!(queue => instance.queue_write_buffer( - queue, - buffer, - buffer_offset, - data - )) - .err(); - - Ok(WebGpuResult::maybe_err(maybe_err)) -} - -#[op] -pub fn op_webgpu_write_texture( - state: &mut OpState, - queue_rid: ResourceId, - destination: super::command_encoder::GpuImageCopyTexture, - data_layout: GpuImageDataLayout, - size: wgpu_types::Extent3d, - buf: ZeroCopyBuf, -) -> Result { - let instance = state.borrow::(); - let texture_resource = state - .resource_table - .get::(destination.texture)?; - let queue_resource = state.resource_table.get::(queue_rid)?; - let queue = queue_resource.0; - - let destination = wgpu_core::command::ImageCopyTexture { - texture: texture_resource.0, - mip_level: destination.mip_level, - origin: destination.origin, - aspect: destination.aspect, - }; - let data_layout = data_layout.into(); - - gfx_ok!(queue => instance.queue_write_texture( - queue, - &destination, - &*buf, - &data_layout, - &size - )) -} -- cgit v1.2.3