Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/canvas-c/src/webgpu/gpu_shared_frame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ pub(crate) unsafe fn import_and_stage(
size,
1,
1,
None,
);
let descriptor = wgpu_core::resource::TextureDescriptor {
label: Some(Cow::Borrowed("videoBlit:SharedFrame")),
Expand Down
4 changes: 4 additions & 0 deletions crates/canvas-napi/src/gpu/enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,8 @@ pub enum GPUVertexFormat {
unorm1010102,
#[napi(value = "unorm8x4-bgra")]
unorm8x4Bgra,
#[napi(value = "snorm10-10-10-2")]
snorm1010102,
}

impl From<CanvasVertexFormat> for GPUVertexFormat {
Expand Down Expand Up @@ -453,6 +455,7 @@ impl From<CanvasVertexFormat> for GPUVertexFormat {
CanvasVertexFormat::Float64x3 => GPUVertexFormat::float64x3,
CanvasVertexFormat::Float64x4 => GPUVertexFormat::float64x4,
CanvasVertexFormat::Unorm10_10_10_2 => GPUVertexFormat::unorm1010102,
CanvasVertexFormat::Snorm10_10_10_2 => GPUVertexFormat::snorm1010102,
CanvasVertexFormat::Uint8 => GPUVertexFormat::uint8,
CanvasVertexFormat::Sint8 => GPUVertexFormat::sint8,
CanvasVertexFormat::Unorm8 => GPUVertexFormat::unorm8,
Expand Down Expand Up @@ -505,6 +508,7 @@ impl Into<CanvasVertexFormat> for GPUVertexFormat {
GPUVertexFormat::float64x3 => CanvasVertexFormat::Float64x3,
GPUVertexFormat::float64x4 => CanvasVertexFormat::Float64x4,
GPUVertexFormat::unorm1010102 => CanvasVertexFormat::Unorm10_10_10_2,
GPUVertexFormat::snorm1010102 => CanvasVertexFormat::Snorm10_10_10_2,
GPUVertexFormat::uint8 => CanvasVertexFormat::Uint8,
GPUVertexFormat::sint8 => CanvasVertexFormat::Sint8,
GPUVertexFormat::unorm8 => CanvasVertexFormat::Unorm8,
Expand Down
3 changes: 2 additions & 1 deletion crates/canvas-napi/src/gpu/pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pub(crate) fn with_compute_pipeline<R>(
Ok(f(c_str(&label), layout(descriptor), &programmable))
}

const VERTEX_FORMATS: [(&str, CanvasVertexFormat); 45] = [
const VERTEX_FORMATS: [(&str, CanvasVertexFormat); 46] = [
("uint8", CanvasVertexFormat::Uint8),
("uint8x2", CanvasVertexFormat::Uint8x2),
("uint8x4", CanvasVertexFormat::Uint8x4),
Expand Down Expand Up @@ -140,6 +140,7 @@ const VERTEX_FORMATS: [(&str, CanvasVertexFormat); 45] = [
("float64x4", CanvasVertexFormat::Float64x4),
("unorm10-10-10-2", CanvasVertexFormat::Unorm10_10_10_2),
("unorm8x4-bgra", CanvasVertexFormat::Unorm8x4Bgra),
("snorm10-10-10-2", CanvasVertexFormat::Snorm10_10_10_2),
];

/// A vertex attribute `format`: `parseVertexFormat`'s index (its order is canvas-c's
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ typedef enum CanvasVertexFormat {
CanvasVertexFormatFloat64x4 = 42,
CanvasVertexFormatUnorm10_10_10_2 = 43,
CanvasVertexFormatUnorm8x4Bgra = 44,
CanvasVertexFormatSnorm10_10_10_2 = 45,
} CanvasVertexFormat;

typedef enum CanvasVertexStepMode {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ typedef enum CanvasVertexFormat {
CanvasVertexFormatFloat64x4 = 42,
CanvasVertexFormatUnorm10_10_10_2 = 43,
CanvasVertexFormatUnorm8x4Bgra = 44,
CanvasVertexFormatSnorm10_10_10_2 = 45,
} CanvasVertexFormat;

typedef enum CanvasVertexStepMode {
Expand Down
Loading