Compare commits
67
Commits
4725723d42
...
0.2.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
389060c238 | ||
|
|
a75252b68f | ||
|
|
d010b37801 | ||
|
|
e61c5f775d | ||
|
|
d503ce7dea | ||
|
|
69f9cad2c1 | ||
|
|
c5d7fd927d | ||
|
|
17977cc718 | ||
|
|
5104d61ef6 | ||
|
|
7d5331aed7 | ||
|
|
7d425e4061 | ||
|
|
a06b040a29 | ||
|
|
af210e2fb2 | ||
|
|
545c4b98e9 | ||
|
|
45c0f3180e | ||
|
|
fc57bee3af | ||
|
|
bcb1b1e98b | ||
|
|
32f5d2b828 | ||
|
|
ad3fcf2592 | ||
|
|
83ef8bcd12 | ||
|
|
e467539f6e | ||
|
|
fb2f454c1c | ||
|
|
7e1bc387ca | ||
|
|
09e62cf667 | ||
|
|
62b5224e6e | ||
|
|
44d26feba5 | ||
|
|
bfac170936 | ||
|
|
523a9b69ac | ||
|
|
571a9db71f | ||
|
|
6ec53bb909 | ||
|
|
6b933465b0 | ||
|
|
3d9cb4df04 | ||
|
|
c62bead6e9 | ||
|
|
9dbd668de9 | ||
|
|
50bf436fa5 | ||
|
|
df4eb36bc8 | ||
|
|
c7afe28cc6 | ||
|
|
d9cb4c4672 | ||
|
|
3a09e11f54 | ||
|
|
e608681ce1 | ||
|
|
d2b0735540 | ||
|
|
8e137c8f33 | ||
|
|
97d5f9001f | ||
|
|
d5e7f60926 | ||
|
|
2673aef0fd | ||
|
|
7ce6b9cd1d | ||
|
|
f5daf66784 | ||
|
|
c3166e552b | ||
|
|
d42c521a96 | ||
|
|
0fc5f5dbb8 | ||
|
|
545e67d72f | ||
|
|
0fcb9ee351 | ||
|
|
6a2cbe2734 | ||
|
|
1c8e12b1e6 | ||
|
|
38538fcd80 | ||
|
|
f56dfe7ecc | ||
|
|
01bc0954b0 | ||
|
|
cb19cd8e30 | ||
|
|
7b9a7fe7a9 | ||
|
|
cef6155f41 | ||
|
|
d57968d6df | ||
|
|
2c52c202fe | ||
|
|
915c5cea65 | ||
|
|
a381c71550 | ||
|
|
cfc1069309 | ||
|
|
90a7cf946f | ||
|
|
0da02f60c4 |
@@ -1,2 +1,3 @@
|
|||||||
.zig-cache
|
.zig-cache
|
||||||
zig-out
|
zig-out
|
||||||
|
examples/mnist
|
||||||
|
|||||||
@@ -0,0 +1,238 @@
|
|||||||
|
# Minimal Zig WebGPU Compute & Render Library
|
||||||
|
|
||||||
|
This is a minimal, self-contained Zig library designed to simplify running compute shaders and rendering pipelines using WebGPU. It abstracts away much of the boilerplate required for GPU device initialization, memory management, bind groups, and pipeline execution.
|
||||||
|
|
||||||
|
## Core Modules
|
||||||
|
|
||||||
|
The library exports the following primary components:
|
||||||
|
|
||||||
|
* **`GpuDevice`**: Initializes the WebGPU instance, adapter, device, and queue. It is configured to prioritize high performance and automatically requests the `ShaderF16` feature if the adapter supports it. It provides the base `GpuAllocator` for raw VRAM allocations.
|
||||||
|
* **`GpuArenaAllocator`**: A memory management layer that wraps a base allocator to track and automatically destroy all allocated WebGPU buffers, textures, views, and pipelines when deinitialized.
|
||||||
|
* **`GpuBuffer`**: Wraps native WebGPU buffers. It provides a `.load()` method for CPU-to-GPU data transfers and a `.read()` method to map GPU data back to the CPU.
|
||||||
|
* **`GpuCompute`**: Compiles WGSL source code into a compute pipeline and dispatches compute workgroups.
|
||||||
|
* **`GpuRender` / `GpuTexture` / `GpuTextureView`**: Components used to initialize render pipelines, set up render attachments (textures), and bind render targets for offscreen drawing.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Example 1: Compute Pipeline
|
||||||
|
|
||||||
|
Below is a complete example demonstrating how to initialize the GPU via the device allocator, manage VRAM using a GPU Arena, run a compute shader, and read the results back to the CPU:
|
||||||
|
|
||||||
|
```zig
|
||||||
|
const std = @import("std");
|
||||||
|
const gpu = @import("gpu");
|
||||||
|
const GpuDevice = gpu.GpuDevice;
|
||||||
|
const GpuArenaAllocator = gpu.GpuArenaAllocator;
|
||||||
|
const GpuBuffer = gpu.GpuBuffer;
|
||||||
|
const GpuCompute = gpu.GpuCompute;
|
||||||
|
|
||||||
|
pub fn main(init: std.process.Init) !void {
|
||||||
|
const allocator = init.gpa;
|
||||||
|
|
||||||
|
// 1. Open GPU Device
|
||||||
|
const device = try GpuDevice.init(.{});
|
||||||
|
defer device.deinit();
|
||||||
|
|
||||||
|
// 2. Create a GPU Arena to manage VRAM
|
||||||
|
var grena = GpuArenaAllocator.init(allocator, device.gpuAllocator());
|
||||||
|
defer grena.deinit();
|
||||||
|
const glloc = grena.gpuAllocator();
|
||||||
|
|
||||||
|
// 3. Load the WGSL compute pipeline
|
||||||
|
const add_cp = try GpuCompute.init(
|
||||||
|
glloc,
|
||||||
|
@embedFile("shaders/add.wgsl"),
|
||||||
|
.{
|
||||||
|
.label = "add",
|
||||||
|
.bindings = &.{
|
||||||
|
.{ .element_size = @sizeOf(f16) },
|
||||||
|
.{ .element_size = @sizeOf(f16) },
|
||||||
|
.{ .element_size = @sizeOf(f16) },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// 4. Setup CPU data
|
||||||
|
const len: usize = 16;
|
||||||
|
const data_a = try allocator.alloc(f16, len);
|
||||||
|
defer allocator.free(data_a);
|
||||||
|
const data_b = try allocator.alloc(f16, len);
|
||||||
|
defer allocator.free(data_b);
|
||||||
|
|
||||||
|
for (0..len) |i| {
|
||||||
|
data_a[i] = @floatFromInt(i);
|
||||||
|
data_b[i] = @floatFromInt(len - 1 - i);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5. Initialize raw GPU Buffers
|
||||||
|
const byte_size = len * @sizeOf(f16);
|
||||||
|
const buf_a = try GpuBuffer.init(glloc, .{ .label = "a", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
|
||||||
|
const buf_b = try GpuBuffer.init(glloc, .{ .label = "b", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
|
||||||
|
const buf_out = try GpuBuffer.init(glloc, .{ .label = "out", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
|
||||||
|
|
||||||
|
// Note: Buffers are safely tied to the GpuArenaAllocator which will automatically
|
||||||
|
// release them at the end. You can also manually call buf_x.deinit() if desired.
|
||||||
|
// This will also release pipelines, textures, ect. Everything using a GpuAllocator to init.
|
||||||
|
|
||||||
|
// 6. Transfer data from CPU slices to GPU Buffers
|
||||||
|
try buf_a.load(f16, data_a);
|
||||||
|
try buf_b.load(f16, data_b);
|
||||||
|
|
||||||
|
// 7. Dispatch the Compute
|
||||||
|
try add_cp.run(glloc, .{ buf_a, buf_b, buf_out });
|
||||||
|
|
||||||
|
// 8. Map and copy the resulting buffer back to the CPU
|
||||||
|
const out = try buf_out.read(allocator, f16);
|
||||||
|
defer allocator.free(out);
|
||||||
|
|
||||||
|
std.debug.print("Result: {any}\n", .{out});
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Example 2: Rendering Pipeline (Offscreen to PPM Image)
|
||||||
|
|
||||||
|
This example demonstrates how to initialize a rendering pipeline, allocate an output texture target, draw primitives via WebGPU,
|
||||||
|
and pull the frame pixels back to the CPU to write a standard image file:
|
||||||
|
|
||||||
|
```zig
|
||||||
|
const std = @import("std");
|
||||||
|
const gpu = @import("gpu");
|
||||||
|
const GpuDevice = gpu.GpuDevice;
|
||||||
|
const GpuArenaAllocator = gpu.GpuArenaAllocator;
|
||||||
|
const GpuBuffer = gpu.GpuBuffer;
|
||||||
|
const GpuRender = gpu.GpuRender;
|
||||||
|
const GpuTexture = gpu.GpuTexture;
|
||||||
|
const GpuTextureView = gpu.GpuTextureView;
|
||||||
|
|
||||||
|
const width: u32 = 512;
|
||||||
|
const height: u32 = 512;
|
||||||
|
|
||||||
|
pub fn main(init: std.process.Init) !void {
|
||||||
|
const allocator = init.gpa;
|
||||||
|
|
||||||
|
// 1. Open GPU Device
|
||||||
|
const device = try GpuDevice.init(.{});
|
||||||
|
defer device.deinit();
|
||||||
|
|
||||||
|
// 2. Init VRAM Arena
|
||||||
|
var grena = GpuArenaAllocator.init(allocator, device.gpuAllocator());
|
||||||
|
defer grena.deinit();
|
||||||
|
const glloc = grena.gpuAllocator();
|
||||||
|
|
||||||
|
// 3. Load Render Pipeline
|
||||||
|
const circle_rp = try GpuRender.init(
|
||||||
|
glloc,
|
||||||
|
@embedFile("shaders/circle.wgsl"),
|
||||||
|
.{ .bindings = &.{}, .texture_format = .RGBA8Unorm, .topology = .TriangleStrip },
|
||||||
|
);
|
||||||
|
defer circle_rp.deinit();
|
||||||
|
|
||||||
|
// 4. Create VRAM texture to render into
|
||||||
|
const texture = try GpuTexture.init(glloc, .{
|
||||||
|
.format = .RGBA8Unorm,
|
||||||
|
.size = .{ .width = width, .height = height, .depthOrArrayLayers = 1 },
|
||||||
|
.usage = .initMany(&.{ .RenderAttachment, .CopySrc }),
|
||||||
|
});
|
||||||
|
defer texture.deinit();
|
||||||
|
|
||||||
|
// 5. Create a view from texture
|
||||||
|
const view = try GpuTextureView.init(glloc, texture, .{});
|
||||||
|
defer view.deinit();
|
||||||
|
|
||||||
|
// 6. Run the rendering pipeline
|
||||||
|
try circle_rp.draw(glloc, view, 4, .{});
|
||||||
|
|
||||||
|
// 7. Load Texture into GpuBuffer
|
||||||
|
const cpu_staging_cpu = try texture.buffCopy(glloc);
|
||||||
|
defer cpu_staging_cpu.deinit();
|
||||||
|
|
||||||
|
// 8. Read GpuBuffer to CPU
|
||||||
|
// This need to be free manually because CPU memory
|
||||||
|
const pixels = try cpu_staging_cpu.read(allocator, u8);
|
||||||
|
defer allocator.free(pixels);
|
||||||
|
|
||||||
|
// 9. Write a simple ppm image
|
||||||
|
try savePpm(init.io, "circle.ppm", width, height, pixels);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn savePpm(io: std.Io, filename: []const u8, w: u32, h: u32, rgba_pixels: []const u8) !void {
|
||||||
|
const file = try std.Io.Dir.cwd().createFile(io, filename, .{});
|
||||||
|
defer file.close(io);
|
||||||
|
|
||||||
|
var buf: [255]u8 = undefined;
|
||||||
|
var writer = file.writer(io, &buf);
|
||||||
|
|
||||||
|
// PPM Header: P6 format means raw RGB bytes
|
||||||
|
try writer.interface.print("P6\n{d} {d}\n255\n", .{ w, h });
|
||||||
|
|
||||||
|
// Strip Alpha channel when writing out to standard RGB PPM format
|
||||||
|
var i: usize = 0;
|
||||||
|
while (i < rgba_pixels.len) : (i += 4) {
|
||||||
|
try writer.interface.writeAll(rgba_pixels[i .. i + 3]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Running Examples Locally
|
||||||
|
|
||||||
|
If you have cloned the repository, you can run the included examples directly using the Zig build system:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Run the rendering example (generates circle.ppm)
|
||||||
|
zig build circle
|
||||||
|
|
||||||
|
# Run the compute example
|
||||||
|
zig build compute
|
||||||
|
|
||||||
|
# Run the compute benchmark
|
||||||
|
zig build bench_cp
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Dependencies
|
||||||
|
|
||||||
|
* **`wgpu.h`**: The library relies on WebGPU C API headers to bind to the native system graphics.
|
||||||
|
|
||||||
|
## System Requirements
|
||||||
|
|
||||||
|
Because this library binds to native system graphics APIs via `wgpu-native`, you must ensure the appropriate development headers and libraries are available on your system before compiling.
|
||||||
|
|
||||||
|
### Linux (Vulkan)
|
||||||
|
|
||||||
|
* **Ubuntu / Debian:** `sudo apt update && sudo apt install libvulkan-dev mesa-vulkan-drivers`
|
||||||
|
* **Fedora / RHEL:** `sudo dnf install vulkan-devel mesa-vulkan-drivers`
|
||||||
|
* **Arch Linux:** `sudo pacman -S vulkan-headers vulkan-icd-loader`
|
||||||
|
|
||||||
|
### macOS (Metal)
|
||||||
|
|
||||||
|
No extra installation required. Automatically links against `Metal`, `QuartzCore`, `Foundation`, and `CoreGraphics`.
|
||||||
|
|
||||||
|
### Windows (DirectX 12)
|
||||||
|
|
||||||
|
No extra installation required. Automatically links against `d3d12`, `dxgi`, and `user32`. Ensure you have MSVC build tools installed.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Adding to your project
|
||||||
|
|
||||||
|
Add it to your `build.zig.zon`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
zig fetch --save git+https://git.bouvais.lu/adrien/zig-wgpu#ref=0.2.1
|
||||||
|
```
|
||||||
|
|
||||||
|
Then, expose it in your `build.zig`:
|
||||||
|
|
||||||
|
```zig
|
||||||
|
const zig_wgpu = b.dependency("zig-wgpu", .{
|
||||||
|
.target = target,
|
||||||
|
.optimize = optimize,
|
||||||
|
});
|
||||||
|
|
||||||
|
exe.root_module.addImport("gpu", zig_wgpu.module("zig-wgpu"));
|
||||||
|
```
|
||||||
@@ -1,61 +1,61 @@
|
|||||||
// build.zig
|
|
||||||
// zig build run
|
|
||||||
//
|
|
||||||
// Expects wgpu-native pre-built in libs/wgpu-native/:
|
|
||||||
// include/wgpu.h
|
|
||||||
// lib/libwgpu_native.a (or .so / .dylib / .dll)
|
|
||||||
//
|
|
||||||
// Download release: https://github.com/gfx-rs/wgpu-native/releases
|
|
||||||
// Pick the archive matching your OS/arch, e.g.:
|
|
||||||
// wgpu-linux-x86_64-release.zip → libwgpu_native.a + wgpu.h
|
|
||||||
// wgpu-macos-aarch64-release.zip
|
|
||||||
// wgpu-windows-x86_64-msvc-release.zip
|
|
||||||
|
|
||||||
const std = @import("std");
|
const std = @import("std");
|
||||||
|
|
||||||
pub fn build(b: *std.Build) void {
|
pub fn build(b: *std.Build) !void {
|
||||||
const target = b.standardTargetOptions(.{});
|
const target = b.standardTargetOptions(.{});
|
||||||
const optimize = b.standardOptimizeOption(.{});
|
const optimize = b.standardOptimizeOption(.{});
|
||||||
|
|
||||||
// 1. Define the module so other projects can import it
|
const mod = b.addModule("zig-wgpu", .{
|
||||||
_ = b.addModule("zig-wgpu", .{
|
|
||||||
.root_source_file = b.path("src/lib.zig"),
|
.root_source_file = b.path("src/lib.zig"),
|
||||||
|
.target = target,
|
||||||
});
|
});
|
||||||
|
|
||||||
const exe = b.addExecutable(.{
|
mod.addIncludePath(b.path("libs/wgpu-native/include"));
|
||||||
.root_module = b.createModule(.{
|
mod.addLibraryPath(b.path("libs/wgpu-native/lib"));
|
||||||
.root_source_file = b.path("src/main.zig"),
|
mod.addObjectFile(b.path("libs/wgpu-native/lib/libwgpu_native.a"));
|
||||||
.link_libc = true,
|
|
||||||
.target = target,
|
|
||||||
.optimize = optimize,
|
|
||||||
}),
|
|
||||||
.name = "gpu_matrix_add",
|
|
||||||
});
|
|
||||||
|
|
||||||
// wgpu-native headers + pre-built static library
|
|
||||||
exe.root_module.addIncludePath(b.path("libs/wgpu-native/include"));
|
|
||||||
exe.root_module.addLibraryPath(b.path("libs/wgpu-native/lib"));
|
|
||||||
exe.root_module.addObjectFile(b.path("libs/wgpu-native/lib/libwgpu_native.a"));
|
|
||||||
|
|
||||||
// Platform-specific system frameworks needed by wgpu-native
|
// Platform-specific system frameworks needed by wgpu-native
|
||||||
const t = target.result;
|
const t = target.result;
|
||||||
if (t.os.tag == .macos) {
|
if (t.os.tag == .macos) {
|
||||||
exe.root_module.linkFramework("Metal", .{});
|
mod.linkFramework("Metal", .{});
|
||||||
exe.root_module.linkFramework("QuartzCore", .{});
|
mod.linkFramework("QuartzCore", .{});
|
||||||
exe.root_module.linkFramework("Foundation", .{});
|
mod.linkFramework("Foundation", .{});
|
||||||
exe.root_module.linkFramework("CoreGraphics", .{});
|
mod.linkFramework("CoreGraphics", .{});
|
||||||
} else if (t.os.tag == .windows) {
|
} else if (t.os.tag == .windows) {
|
||||||
exe.root_module.linkSystemLibrary("d3d12", .{});
|
mod.linkSystemLibrary("d3d12", .{});
|
||||||
exe.root_module.linkSystemLibrary("dxgi", .{});
|
mod.linkSystemLibrary("dxgi", .{});
|
||||||
exe.root_module.linkSystemLibrary("user32", .{});
|
mod.linkSystemLibrary("user32", .{});
|
||||||
} else {
|
} else {
|
||||||
exe.root_module.linkSystemLibrary("vulkan", .{});
|
mod.linkSystemLibrary("vulkan", .{});
|
||||||
exe.root_module.linkSystemLibrary("gcc_s", .{});
|
mod.linkSystemLibrary("gcc_s", .{});
|
||||||
}
|
}
|
||||||
|
|
||||||
b.installArtifact(exe);
|
if (b.pkg_hash.len == 0) {
|
||||||
|
var threaded: std.Io.Threaded = .init_single_threaded;
|
||||||
|
const io = threaded.io();
|
||||||
|
|
||||||
const run = b.addRunArtifact(exe);
|
var buf: [1024]u8 = undefined;
|
||||||
run.step.dependOn(b.getInstallStep());
|
const exemples = try std.Io.Dir.cwd().openDir(io, "examples", .{ .access_sub_paths = false, .iterate = true });
|
||||||
b.step("run", "Build and run").dependOn(&run.step);
|
var iter = exemples.iterate();
|
||||||
|
while (try iter.next(io)) |entry| {
|
||||||
|
if (entry.kind != .file) continue;
|
||||||
|
if (!std.mem.eql(u8, entry.name[entry.name.len - 4 ..], ".zig")) continue;
|
||||||
|
|
||||||
|
const exe = b.addExecutable(.{
|
||||||
|
.name = entry.name[0 .. entry.name.len - 4],
|
||||||
|
.root_module = b.createModule(.{
|
||||||
|
.root_source_file = b.path(try std.fmt.bufPrint(&buf, "examples/{s}", .{entry.name})),
|
||||||
|
.target = target,
|
||||||
|
.optimize = optimize,
|
||||||
|
.imports = &.{},
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
exe.root_module.addImport("gpu", mod);
|
||||||
|
|
||||||
|
b.installArtifact(exe);
|
||||||
|
|
||||||
|
const run_step = b.step(entry.name[0 .. entry.name.len - 4], try std.fmt.bufPrint(&buf, "Run {s} demo", .{entry.name}));
|
||||||
|
const run_cmd = b.addRunArtifact(exe);
|
||||||
|
run_step.dependOn(&run_cmd.step);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-72
@@ -1,81 +1,13 @@
|
|||||||
.{
|
.{
|
||||||
// This is the default name used by packages depending on this one. For
|
|
||||||
// example, when a user runs `zig fetch --save <url>`, this field is used
|
|
||||||
// as the key in the `dependencies` table. Although the user can choose a
|
|
||||||
// different name, most users will stick with this provided value.
|
|
||||||
//
|
|
||||||
// It is redundant to include "zig" in this name because it is already
|
|
||||||
// within the Zig package namespace.
|
|
||||||
.name = .zig_wgpu,
|
.name = .zig_wgpu,
|
||||||
// This is a [Semantic Version](https://semver.org/).
|
.version = "0.2.3",
|
||||||
// In a future version of Zig it will be used for package deduplication.
|
.fingerprint = 0x5d0e853acbc0c2c6,
|
||||||
.version = "0.0.0",
|
|
||||||
// Together with name, this represents a globally unique package
|
|
||||||
// identifier. This field is generated by the Zig toolchain when the
|
|
||||||
// package is first created, and then *never changes*. This allows
|
|
||||||
// unambiguous detection of one package being an updated version of
|
|
||||||
// another.
|
|
||||||
//
|
|
||||||
// When forking a Zig project, this id should be regenerated (delete the
|
|
||||||
// field and run `zig build`) if the upstream project is still maintained.
|
|
||||||
// Otherwise, the fork is *hostile*, attempting to take control over the
|
|
||||||
// original project's identity. Thus it is recommended to leave the comment
|
|
||||||
// on the following line intact, so that it shows up in code reviews that
|
|
||||||
// modify the field.
|
|
||||||
.fingerprint = 0x5d0e853acbc0c2c6, // Changing this has security and trust implications.
|
|
||||||
// Tracks the earliest Zig version that the package considers to be a
|
|
||||||
// supported use case.
|
|
||||||
.minimum_zig_version = "0.16.0",
|
.minimum_zig_version = "0.16.0",
|
||||||
// This field is optional.
|
.dependencies = .{},
|
||||||
// Each dependency must either provide a `url` and `hash`, or a `path`.
|
|
||||||
// `zig build --fetch` can be used to fetch all dependencies of a package, recursively.
|
|
||||||
// Once all dependencies are fetched, `zig build` no longer requires
|
|
||||||
// internet connectivity.
|
|
||||||
.dependencies = .{
|
|
||||||
// See `zig fetch --save <url>` for a command-line interface for adding dependencies.
|
|
||||||
//.example = .{
|
|
||||||
// // When updating this field to a new URL, be sure to delete the corresponding
|
|
||||||
// // `hash`, otherwise you are communicating that you expect to find the old hash at
|
|
||||||
// // the new URL. If the contents of a URL change this will result in a hash mismatch
|
|
||||||
// // which will prevent zig from using it.
|
|
||||||
// .url = "https://example.com/foo.tar.gz",
|
|
||||||
//
|
|
||||||
// // This is computed from the file contents of the directory of files that is
|
|
||||||
// // obtained after fetching `url` and applying the inclusion rules given by
|
|
||||||
// // `paths`.
|
|
||||||
// //
|
|
||||||
// // This field is the source of truth; packages do not come from a `url`; they
|
|
||||||
// // come from a `hash`. `url` is just one of many possible mirrors for how to
|
|
||||||
// // obtain a package matching this `hash`.
|
|
||||||
// //
|
|
||||||
// // Uses the [multihash](https://multiformats.io/multihash/) format.
|
|
||||||
// .hash = "...",
|
|
||||||
//
|
|
||||||
// // When this is provided, the package is found in a directory relative to the
|
|
||||||
// // build root. In this case the package's hash is irrelevant and therefore not
|
|
||||||
// // computed. This field and `url` are mutually exclusive.
|
|
||||||
// .path = "foo",
|
|
||||||
//
|
|
||||||
// // When this is set to `true`, a package is declared to be lazily
|
|
||||||
// // fetched. This makes the dependency only get fetched if it is
|
|
||||||
// // actually used.
|
|
||||||
// .lazy = false,
|
|
||||||
//},
|
|
||||||
},
|
|
||||||
// Specifies the set of files and directories that are included in this package.
|
|
||||||
// Only files and directories listed here are included in the `hash` that
|
|
||||||
// is computed for this package. Only files listed here will remain on disk
|
|
||||||
// when using the zig package manager. As a rule of thumb, one should list
|
|
||||||
// files required for compilation plus any license(s).
|
|
||||||
// Paths are relative to the build root. Use the empty string (`""`) to refer to
|
|
||||||
// the build root itself.
|
|
||||||
// A directory listed here means that all files within, recursively, are included.
|
|
||||||
.paths = .{
|
.paths = .{
|
||||||
"build.zig",
|
"build.zig",
|
||||||
"build.zig.zon",
|
"build.zig.zon",
|
||||||
"src",
|
"src",
|
||||||
// For example...
|
"libs",
|
||||||
//"LICENSE",
|
|
||||||
//"README.md",
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,184 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const gpu = @import("gpu");
|
||||||
|
const GpuDevice = gpu.GpuDevice;
|
||||||
|
const GpuArenaAllocator = gpu.GpuArenaAllocator;
|
||||||
|
const GpuAllocator = gpu.GpuAllocator;
|
||||||
|
const GpuBuffer = gpu.GpuBuffer;
|
||||||
|
const GpuCompute = gpu.GpuCompute;
|
||||||
|
|
||||||
|
pub const std_options = std.Options{ .log_level = .info };
|
||||||
|
|
||||||
|
/// Minimal implementation of a f16 Vector
|
||||||
|
const Vec = struct {
|
||||||
|
buf: GpuBuffer,
|
||||||
|
len: usize,
|
||||||
|
|
||||||
|
// Changed: glloc is passed by value (const)
|
||||||
|
pub fn initZero(glloc: GpuAllocator, len: usize) !Vec {
|
||||||
|
return .{
|
||||||
|
.buf = try GpuBuffer.init(glloc, .{
|
||||||
|
.size = len * @sizeOf(f16),
|
||||||
|
.usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }),
|
||||||
|
}),
|
||||||
|
.len = len,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Changed: glloc is passed by value
|
||||||
|
pub fn initLoad(glloc: GpuAllocator, data: []const f16) !Vec {
|
||||||
|
var self = try initZero(glloc, data.len);
|
||||||
|
try self.load(data); // Direct access via the interface copy
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deinit(self: Vec) void {
|
||||||
|
self.buf.deinit();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// CPU to GPU.
|
||||||
|
pub fn load(self: Vec, data: []const f16) !void {
|
||||||
|
try self.buf.load(f16, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Changed: glloc is passed by value instead of *GpuAllocator
|
||||||
|
pub fn run(self: Vec, glloc: GpuAllocator, other: Vec, process: GpuCompute) !Vec {
|
||||||
|
std.debug.assert(self.len == other.len);
|
||||||
|
|
||||||
|
const result = try Vec.initZero(glloc, self.len);
|
||||||
|
errdefer result.deinit();
|
||||||
|
|
||||||
|
try process.run(glloc, .{ self.buf, other.buf, result.buf });
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Changed: glloc is passed by value instead of *GpuAllocator
|
||||||
|
pub fn read(self: Vec, alloc: std.mem.Allocator) ![]f16 {
|
||||||
|
return self.buf.read(alloc, f16);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
pub fn main(init: std.process.Init) !void {
|
||||||
|
const device = try GpuDevice.init(.{ .vram_bytes_limit = 4 * 1024 * 1024 * 1024 });
|
||||||
|
defer device.deinit();
|
||||||
|
|
||||||
|
var grena = GpuArenaAllocator.init(init.gpa, device.gpuAllocator());
|
||||||
|
defer grena.deinit();
|
||||||
|
const glloc = grena.gpuAllocator();
|
||||||
|
|
||||||
|
const add_pip = try GpuCompute.init(glloc, @embedFile("shaders/add.wgsl"), .{ .bindings = &.{
|
||||||
|
.{ .element_size = @sizeOf(f16) },
|
||||||
|
.{ .element_size = @sizeOf(f16) },
|
||||||
|
.{ .element_size = @sizeOf(f16) },
|
||||||
|
} });
|
||||||
|
defer add_pip.deinit();
|
||||||
|
|
||||||
|
const allocator = init.gpa;
|
||||||
|
|
||||||
|
const sizes = [_]usize{
|
||||||
|
1,
|
||||||
|
256,
|
||||||
|
1024,
|
||||||
|
4 * 1024,
|
||||||
|
4 * 4 * 1024,
|
||||||
|
4 * 4 * 4 * 1024,
|
||||||
|
4 * 4 * 4 * 4 * 1024,
|
||||||
|
1024 * 1024,
|
||||||
|
4 * 1024 * 1024,
|
||||||
|
4 * 4 * 1024 * 1024,
|
||||||
|
4 * 4 * 4 * 1024 * 1024,
|
||||||
|
// 4 * 4 * 4 * 4 * 1024 * 1024,
|
||||||
|
// 4 * 4 * 4 * 4 * 4 * 1024 * 1024,
|
||||||
|
};
|
||||||
|
|
||||||
|
const iterations = 10;
|
||||||
|
|
||||||
|
// Updated headers to include VRAM footprint info
|
||||||
|
std.debug.print("\n| Size (MB) | Phase | Time (ms) | GB/s | VRAM Peak |\n", .{});
|
||||||
|
std.debug.print("|----------:|:------------------|-----------:|---------:|----------:|\n", .{});
|
||||||
|
|
||||||
|
for (sizes) |size| {
|
||||||
|
// --- Phase 1: Host Init/Alloc (Outside the iteration loop for pure host prep) ---
|
||||||
|
const data_a = try allocator.alloc(f16, size);
|
||||||
|
defer allocator.free(data_a);
|
||||||
|
const data_b = try allocator.alloc(f16, size);
|
||||||
|
defer allocator.free(data_b);
|
||||||
|
|
||||||
|
for (0..size) |i| {
|
||||||
|
data_a[i] = @floatFromInt(i);
|
||||||
|
data_b[i] = @floatFromInt(size - 1 - i);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Track best times across iterations
|
||||||
|
var min_alloc_ns: u64 = std.math.maxInt(u64);
|
||||||
|
var min_transfer_ns: u64 = std.math.maxInt(u64);
|
||||||
|
var min_compute_ns: u64 = std.math.maxInt(u64);
|
||||||
|
|
||||||
|
// Track peak VRAM usage observed during the iterations
|
||||||
|
var peak_vram_bytes: u64 = 0;
|
||||||
|
|
||||||
|
for (0..iterations) |_| {
|
||||||
|
// --- 1. GPU ALLOCATION PHASE ---
|
||||||
|
const alloc_start = std.Io.Clock.awake.now(init.io);
|
||||||
|
|
||||||
|
const a = try Vec.initLoad(glloc, data_a);
|
||||||
|
defer a.deinit();
|
||||||
|
const b = try Vec.initLoad(glloc, data_b);
|
||||||
|
defer b.deinit();
|
||||||
|
|
||||||
|
const alloc_duration = alloc_start.durationTo(std.Io.Clock.awake.now(init.io));
|
||||||
|
const alloc_ns = @as(u64, @intCast(alloc_duration.toNanoseconds()));
|
||||||
|
if (alloc_ns < min_alloc_ns) min_alloc_ns = alloc_ns;
|
||||||
|
|
||||||
|
// --- 2. COMPUTE PHASE ---
|
||||||
|
const compute_start = std.Io.Clock.awake.now(init.io);
|
||||||
|
|
||||||
|
const sum = try a.run(glloc, b, add_pip);
|
||||||
|
defer sum.deinit();
|
||||||
|
|
||||||
|
// All 3 buffers (a, b, sum) are currently resident in VRAM here.
|
||||||
|
// Querying now catches the true peak allocation step.
|
||||||
|
if (grena.allocated_vram_bytes > peak_vram_bytes)
|
||||||
|
peak_vram_bytes = grena.allocated_vram_bytes;
|
||||||
|
|
||||||
|
device.poll();
|
||||||
|
|
||||||
|
const compute_duration = compute_start.durationTo(std.Io.Clock.awake.now(init.io));
|
||||||
|
const compute_ns = @as(u64, @intCast(compute_duration.toNanoseconds()));
|
||||||
|
if (compute_ns < min_compute_ns) min_compute_ns = compute_ns;
|
||||||
|
|
||||||
|
// --- 3. TRANSFER PHASE (Device -> Host) ---
|
||||||
|
const transfer_start = std.Io.Clock.awake.now(init.io);
|
||||||
|
|
||||||
|
const out = try sum.read(allocator);
|
||||||
|
defer allocator.free(out);
|
||||||
|
|
||||||
|
const transfer_duration = transfer_start.durationTo(std.Io.Clock.awake.now(init.io));
|
||||||
|
const transfer_ns = @as(u64, @intCast(transfer_duration.toNanoseconds()));
|
||||||
|
if (transfer_ns < min_transfer_ns) min_transfer_ns = transfer_ns;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Metrics Calculations ---
|
||||||
|
const f_size = @as(f64, @floatFromInt(size));
|
||||||
|
const element_bytes = f_size * @as(f64, @floatFromInt(@sizeOf(f16)));
|
||||||
|
const mb = element_bytes / (1024.0 * 1024.0);
|
||||||
|
|
||||||
|
// Individual Phase Timings (ms)
|
||||||
|
const alloc_ms = @as(f64, @floatFromInt(min_alloc_ns)) / 1_000_000.0;
|
||||||
|
const compute_ms = @as(f64, @floatFromInt(min_compute_ns)) / 1_000_000.0;
|
||||||
|
const transfer_ms = @as(f64, @floatFromInt(min_transfer_ns)) / 1_000_000.0;
|
||||||
|
|
||||||
|
// Bandwidth Calculations
|
||||||
|
const alloc_gb_s = (element_bytes * 2.0 / 1_000_000_000.0) / (@as(f64, @floatFromInt(min_alloc_ns)) / 1_000_000_000.0);
|
||||||
|
const compute_gb_s = (element_bytes * 3.0 / 1_000_000_000.0) / (@as(f64, @floatFromInt(min_compute_ns)) / 1_000_000_000.0);
|
||||||
|
const transfer_gb_s = (element_bytes * 1.0 / 1_000_000_000.0) / (@as(f64, @floatFromInt(min_transfer_ns)) / 1_000_000_000.0);
|
||||||
|
|
||||||
|
// Convert Peak VRAM bytes to Megabytes for clean display
|
||||||
|
const peak_vram_mb = @as(f64, @floatFromInt(peak_vram_bytes)) / (1024.0 * 1024.0);
|
||||||
|
|
||||||
|
// Print Results per Size Block with VRAM column aligned
|
||||||
|
std.debug.print("| {d:9.2} | 1. GPU Alloc/Load | {d:10.3} | {d:8.2} | |\n", .{ mb, alloc_ms, alloc_gb_s });
|
||||||
|
std.debug.print("| | 2. Compute | {d:10.3} | {d:8.2} | {d:7.2} MB|\n", .{ compute_ms, compute_gb_s, peak_vram_mb });
|
||||||
|
std.debug.print("| | 3. Transfer (D->H)| {d:10.3} | {d:8.2} | |\n", .{ transfer_ms, transfer_gb_s });
|
||||||
|
std.debug.print("|-----------|-------------------|------------|---------:|----------:|\n", .{});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const gpu = @import("gpu");
|
||||||
|
const GpuDevice = gpu.GpuDevice;
|
||||||
|
const GpuArenaAllocator = gpu.GpuArenaAllocator;
|
||||||
|
const GpuBuffer = gpu.GpuBuffer;
|
||||||
|
const GpuRender = gpu.GpuRender;
|
||||||
|
const GpuTexture = gpu.GpuTexture;
|
||||||
|
const GpuTextureView = gpu.GpuTextureView;
|
||||||
|
|
||||||
|
const width: u32 = 512;
|
||||||
|
const height: u32 = 512;
|
||||||
|
|
||||||
|
pub fn main(init: std.process.Init) !void {
|
||||||
|
const allocator = init.gpa;
|
||||||
|
|
||||||
|
// 1. Open GPU Device
|
||||||
|
const device = try GpuDevice.init(.{});
|
||||||
|
defer device.deinit();
|
||||||
|
|
||||||
|
// 2. Init VRAM Arena
|
||||||
|
var grena = GpuArenaAllocator.init(allocator, device.gpuAllocator());
|
||||||
|
defer grena.deinit();
|
||||||
|
const glloc = grena.gpuAllocator();
|
||||||
|
|
||||||
|
// 3. Load Render Pipeline
|
||||||
|
const circle_rp = try GpuRender.init(
|
||||||
|
glloc,
|
||||||
|
@embedFile("shaders/circle.wgsl"),
|
||||||
|
.{ .bindings = &.{}, .texture_format = .RGBA8Unorm, .topology = .TriangleStrip },
|
||||||
|
);
|
||||||
|
defer circle_rp.deinit();
|
||||||
|
|
||||||
|
// 4. Create VRAM texture to render into
|
||||||
|
const texture = try GpuTexture.init(glloc, .{
|
||||||
|
.format = .RGBA8Unorm,
|
||||||
|
.size = .{ .width = width, .height = height, .depthOrArrayLayers = 1 },
|
||||||
|
.usage = .initMany(&.{ .RenderAttachment, .CopySrc }),
|
||||||
|
});
|
||||||
|
defer texture.deinit();
|
||||||
|
|
||||||
|
// 5. Create a view from texture
|
||||||
|
const view = try GpuTextureView.init(glloc, texture, .{});
|
||||||
|
defer view.deinit();
|
||||||
|
|
||||||
|
// 6. Run the rendering pipeline
|
||||||
|
try circle_rp.draw(glloc, view, 4, .{});
|
||||||
|
|
||||||
|
// 7. Load Texture into GpuBuffer
|
||||||
|
const cpu_staging_cpu = try texture.buffCopy(glloc);
|
||||||
|
defer cpu_staging_cpu.deinit();
|
||||||
|
|
||||||
|
// 8. Read GpuBuffer to CPU
|
||||||
|
// This need to be free manually because CPU memory
|
||||||
|
const pixels = try cpu_staging_cpu.read(allocator, u8);
|
||||||
|
defer allocator.free(pixels);
|
||||||
|
|
||||||
|
// 9. Write a simple ppm image
|
||||||
|
try savePpm(init.io, "circle.ppm", width, height, pixels);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn savePpm(io: std.Io, filename: []const u8, w: u32, h: u32, rgba_pixels: []const u8) !void {
|
||||||
|
const file = try std.Io.Dir.cwd().createFile(io, filename, .{});
|
||||||
|
defer file.close(io);
|
||||||
|
|
||||||
|
var buf: [255]u8 = undefined;
|
||||||
|
var writer = file.writer(io, &buf);
|
||||||
|
|
||||||
|
// PPM Header: P6 format means raw RGB bytes
|
||||||
|
try writer.interface.print("P6\n{d} {d}\n255\n", .{ w, h });
|
||||||
|
|
||||||
|
// Strip Alpha channel when writing out to standard RGB PPM format
|
||||||
|
var i: usize = 0;
|
||||||
|
while (i < rgba_pixels.len) : (i += 4) {
|
||||||
|
try writer.interface.writeAll(rgba_pixels[i .. i + 3]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const gpu = @import("gpu");
|
||||||
|
const GpuDevice = gpu.GpuDevice;
|
||||||
|
const GpuArenaAllocator = gpu.GpuArenaAllocator;
|
||||||
|
const GpuBuffer = gpu.GpuBuffer;
|
||||||
|
const GpuCompute = gpu.GpuCompute;
|
||||||
|
|
||||||
|
pub fn main(init: std.process.Init) !void {
|
||||||
|
const allocator = init.gpa;
|
||||||
|
|
||||||
|
// 1. Open GPU Device
|
||||||
|
const device = try GpuDevice.init(.{});
|
||||||
|
defer device.deinit();
|
||||||
|
|
||||||
|
// 2. Create a GPU Arena to manage VRAM
|
||||||
|
var grena = GpuArenaAllocator.init(allocator, device.gpuAllocator());
|
||||||
|
defer grena.deinit();
|
||||||
|
const glloc = grena.gpuAllocator();
|
||||||
|
|
||||||
|
// 3. Load the WGSL compute pipeline
|
||||||
|
const add_cp = try GpuCompute.init(
|
||||||
|
glloc,
|
||||||
|
@embedFile("shaders/add.wgsl"),
|
||||||
|
.{
|
||||||
|
.label = "add",
|
||||||
|
.bindings = &.{
|
||||||
|
.{ .element_size = @sizeOf(f16) },
|
||||||
|
.{ .element_size = @sizeOf(f16) },
|
||||||
|
.{ .element_size = @sizeOf(f16) },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// 4. Setup CPU data
|
||||||
|
const len: usize = 16;
|
||||||
|
const data_a = try allocator.alloc(f16, len);
|
||||||
|
defer allocator.free(data_a);
|
||||||
|
const data_b = try allocator.alloc(f16, len);
|
||||||
|
defer allocator.free(data_b);
|
||||||
|
|
||||||
|
for (0..len) |i| {
|
||||||
|
data_a[i] = @floatFromInt(i);
|
||||||
|
data_b[i] = @floatFromInt(len - 1 - i);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5. Initialize raw GPU Buffers
|
||||||
|
const byte_size = len * @sizeOf(f16);
|
||||||
|
const buf_a = try GpuBuffer.init(glloc, .{ .label = "a", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
|
||||||
|
const buf_b = try GpuBuffer.init(glloc, .{ .label = "b", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
|
||||||
|
const buf_out = try GpuBuffer.init(glloc, .{ .label = "out", .size = byte_size, .usage = .initMany(&.{ .Storage, .CopyDst, .CopySrc }) });
|
||||||
|
|
||||||
|
// Note: Buffers are safely tied to the GpuArenaAllocator which will automatically
|
||||||
|
// release them at the end. You can also manually call buf_x.deinit() if desired.
|
||||||
|
// This will also release pipelines, textures, ect. Everything using a GpuAllocator to init.
|
||||||
|
|
||||||
|
// 6. Transfer data from CPU slices to GPU Buffers
|
||||||
|
try buf_a.load(f16, data_a);
|
||||||
|
try buf_b.load(f16, data_b);
|
||||||
|
|
||||||
|
// 7. Dispatch the Compute
|
||||||
|
try add_cp.run(glloc, .{ buf_a, buf_b, buf_out });
|
||||||
|
|
||||||
|
// 8. Map and copy the resulting buffer back to the CPU
|
||||||
|
const out = try buf_out.read(allocator, f16);
|
||||||
|
defer allocator.free(out);
|
||||||
|
|
||||||
|
std.debug.print("Result: {any}\n", .{out});
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
enable f16;
|
||||||
|
|
||||||
|
@group(0) @binding(0) var<storage, read> A: array<f16>;
|
||||||
|
@group(0) @binding(1) var<storage, read> B: array<f16>;
|
||||||
|
@group(0) @binding(2) var<storage, read_write> C: array<f16>;
|
||||||
|
@group(0) @binding(3) var<uniform> size: u32;
|
||||||
|
|
||||||
|
@compute @workgroup_size(256)
|
||||||
|
fn main(
|
||||||
|
@builtin(global_invocation_id) global_id : vec3<u32>,
|
||||||
|
@builtin(num_workgroups) num_workgroups: vec3<u32>
|
||||||
|
) {
|
||||||
|
// 1. Calculate the total number of threads across the entire grid
|
||||||
|
let total_threads = num_workgroups.x * 256u;
|
||||||
|
|
||||||
|
// 2. Start at this thread's unique global ID
|
||||||
|
var index = global_id.x;
|
||||||
|
|
||||||
|
// 3. Stride through the tensor elements
|
||||||
|
while (index < size) {
|
||||||
|
C[index] = A[index] + B[index];
|
||||||
|
index += total_threads; // Jump forward by the total thread count
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
struct VertexOutput {
|
||||||
|
@builtin(position) position: vec4f,
|
||||||
|
@location(0) uv: vec2f,
|
||||||
|
};
|
||||||
|
|
||||||
|
@vertex
|
||||||
|
fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput {
|
||||||
|
var output: VertexOutput;
|
||||||
|
// Hardcoded fullscreen quad layout using 4 vertices (Triangle Strip)
|
||||||
|
// Indexes: 0: Top-Left, 1: Bottom-Left, 2: Top-Right, 3: Bottom-Right
|
||||||
|
var pos = array<vec2f, 4>(
|
||||||
|
vec2f(-1.0, 1.0),
|
||||||
|
vec2f(-1.0, -1.0),
|
||||||
|
vec2f( 1.0, 1.0),
|
||||||
|
vec2f( 1.0, -1.0)
|
||||||
|
);
|
||||||
|
|
||||||
|
output.position = vec4f(pos[vertex_index], 0.0, 1.0);
|
||||||
|
output.uv = pos[vertex_index]; // Ranges cleanly from -1.0 to 1.0
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
@fragment
|
||||||
|
fn fs_main(input: VertexOutput) -> @location(0) vec4f {
|
||||||
|
// Distance from the center (0,0)
|
||||||
|
let distance = length(input.uv);
|
||||||
|
let radius = 0.5;
|
||||||
|
|
||||||
|
// Smooth out pixel edges (anti-aliasing)
|
||||||
|
let edge_softness = 0.005;
|
||||||
|
let alpha = 1.0 - smoothstep(radius - edge_softness, radius + edge_softness, distance);
|
||||||
|
|
||||||
|
if (alpha <= 0.0) {
|
||||||
|
discard;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw a sharp/smooth red circle
|
||||||
|
return vec4f(1.0, 0.3, 0.3, alpha);
|
||||||
|
}
|
||||||
+49
-130
@@ -1,140 +1,59 @@
|
|||||||
const std = @import("std");
|
const GpuDevice = @import("GpuDevice.zig");
|
||||||
const sh = @import("shaders.zig");
|
const c = @import("utils.zig").c;
|
||||||
const c = @import("c.zig").c;
|
|
||||||
|
|
||||||
const GpuAllocator = @This();
|
pub const VTable = struct {
|
||||||
|
allocBuffer: *const fn (ctx: *anyopaque, desc: c.WGPUBufferDescriptor) anyerror!c.WGPUBuffer,
|
||||||
instance: c.WGPUInstance,
|
freeBuffer: *const fn (ctx: *anyopaque, buf_raw: c.WGPUBuffer) void,
|
||||||
adapter: c.WGPUAdapter,
|
allocTexture: *const fn (ctx: *anyopaque, desc: c.WGPUTextureDescriptor) anyerror!c.WGPUTexture,
|
||||||
device: c.WGPUDevice,
|
freeTexture: *const fn (ctx: *anyopaque, buf_raw: c.WGPUTexture) void,
|
||||||
queue: c.WGPUQueue,
|
allocTextureView: *const fn (ctx: *anyopaque, texture: c.WGPUTexture, desc: c.WGPUTextureViewDescriptor) anyerror!c.WGPUTextureView,
|
||||||
|
freeTextureView: *const fn (ctx: *anyopaque, buf_raw: c.WGPUTextureView) void,
|
||||||
// Lazily created, cached for lifetime of allocator
|
allocRenderPipeline: *const fn (ctx: *anyopaque, desc: c.WGPURenderPipelineDescriptor) anyerror!c.WGPURenderPipeline,
|
||||||
_pip_add: c.WGPUComputePipeline = null,
|
freeRenderPipeline: *const fn (ctx: *anyopaque, buf_raw: c.WGPURenderPipeline) void,
|
||||||
_pip_scale: c.WGPUComputePipeline = null,
|
allocComputePipeline: *const fn (ctx: *anyopaque, desc: c.WGPUComputePipelineDescriptor) anyerror!c.WGPUComputePipeline,
|
||||||
|
freeComputePipeline: *const fn (ctx: *anyopaque, buf_raw: c.WGPUComputePipeline) void,
|
||||||
pub fn init() !GpuAllocator {
|
|
||||||
const instance = c.wgpuCreateInstance(
|
|
||||||
&std.mem.zeroes(c.WGPUInstanceDescriptor),
|
|
||||||
) orelse return error.NoInstance;
|
|
||||||
errdefer c.wgpuInstanceRelease(instance);
|
|
||||||
|
|
||||||
var ctx = Ctx{};
|
|
||||||
_ = c.wgpuInstanceRequestAdapter(
|
|
||||||
instance,
|
|
||||||
&.{ .powerPreference = c.WGPUPowerPreference_HighPerformance },
|
|
||||||
.{ .callback = onAdapter, .userdata1 = &ctx },
|
|
||||||
);
|
|
||||||
c.wgpuInstanceProcessEvents(instance);
|
|
||||||
const adapter = ctx.adapter orelse return error.NoAdapter;
|
|
||||||
errdefer c.wgpuAdapterRelease(adapter);
|
|
||||||
|
|
||||||
_ = c.wgpuAdapterRequestDevice(
|
|
||||||
adapter,
|
|
||||||
null,
|
|
||||||
.{ .callback = onDevice, .userdata1 = &ctx },
|
|
||||||
);
|
|
||||||
c.wgpuInstanceProcessEvents(instance);
|
|
||||||
const device = ctx.device orelse return error.NoDevice;
|
|
||||||
|
|
||||||
return .{
|
|
||||||
.instance = instance,
|
|
||||||
.adapter = adapter,
|
|
||||||
.device = device,
|
|
||||||
.queue = c.wgpuDeviceGetQueue(device),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn deinit(self: *GpuAllocator) void {
|
|
||||||
if (self._pip_add) |p| c.wgpuComputePipelineRelease(p);
|
|
||||||
if (self._pip_scale) |p| c.wgpuComputePipelineRelease(p);
|
|
||||||
c.wgpuQueueRelease(self.queue);
|
|
||||||
c.wgpuDeviceRelease(self.device);
|
|
||||||
c.wgpuAdapterRelease(self.adapter);
|
|
||||||
c.wgpuInstanceRelease(self.instance);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Internal ─────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
pub fn makeBuffer(
|
|
||||||
self: *GpuAllocator,
|
|
||||||
bytes: u64,
|
|
||||||
usage: c.WGPUBufferUsage,
|
|
||||||
) !c.WGPUBuffer {
|
|
||||||
return c.wgpuDeviceCreateBuffer(self.device, &.{
|
|
||||||
.usage = usage,
|
|
||||||
.size = bytes,
|
|
||||||
}) orelse error.BufferAlloc;
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn pipAdd(self: *GpuAllocator) !c.WGPUComputePipeline {
|
|
||||||
if (self._pip_add == null)
|
|
||||||
self._pip_add = try buildPipeline(self.device, sh.SHADER_ADD);
|
|
||||||
return self._pip_add.?;
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn pipScale(self: *GpuAllocator) !c.WGPUComputePipeline {
|
|
||||||
if (self._pip_scale == null)
|
|
||||||
self._pip_scale = try buildPipeline(self.device, sh.SHADER_SCALE);
|
|
||||||
return self._pip_scale.?;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Poll until GPU work completes. Use after submit if you need CPU sync.
|
|
||||||
pub fn poll(self: *GpuAllocator) void {
|
|
||||||
_ = c.wgpuDevicePoll(self.device, 1, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
const Ctx = struct {
|
|
||||||
adapter: c.WGPUAdapter = null,
|
|
||||||
device: c.WGPUDevice = null,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fn onAdapter(
|
device: GpuDevice,
|
||||||
status: c.WGPURequestAdapterStatus,
|
ptr: *anyopaque,
|
||||||
adapter: c.WGPUAdapter,
|
vtable: *const VTable,
|
||||||
_: c.WGPUStringView,
|
|
||||||
userdata1: ?*anyopaque,
|
pub fn allocBuffer(self: @This(), desc: c.WGPUBufferDescriptor) !c.WGPUBuffer {
|
||||||
_: ?*anyopaque,
|
return self.vtable.allocBuffer(self.ptr, desc);
|
||||||
) callconv(.c) void {
|
|
||||||
if (status != c.WGPURequestAdapterStatus_Success) {
|
|
||||||
std.log.err("Adapter request failed (status={d})", .{status});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const ctx: *Ctx = @ptrCast(@alignCast(userdata1.?));
|
|
||||||
ctx.adapter = adapter;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn onDevice(
|
pub fn freeBuffer(self: @This(), raw: c.WGPUBuffer) void {
|
||||||
status: c.WGPURequestDeviceStatus,
|
self.vtable.freeBuffer(self.ptr, raw);
|
||||||
device: c.WGPUDevice,
|
|
||||||
_: c.WGPUStringView,
|
|
||||||
userdata1: ?*anyopaque,
|
|
||||||
_: ?*anyopaque,
|
|
||||||
) callconv(.c) void {
|
|
||||||
if (status != c.WGPURequestDeviceStatus_Success) {
|
|
||||||
std.log.err("Device request failed (status={d})", .{status});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const ctx: *Ctx = @ptrCast(@alignCast(userdata1.?));
|
|
||||||
ctx.device = device;
|
|
||||||
std.debug.print("{?}", .{device});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn buildPipeline(device: c.WGPUDevice, wgsl: []const u8) !c.WGPUComputePipeline {
|
pub fn allocTexture(self: @This(), desc: c.WGPUTextureDescriptor) !c.WGPUTexture {
|
||||||
var wgsl_src = c.WGPUShaderSourceWGSL{
|
return self.vtable.allocTexture(self.ptr, desc);
|
||||||
.chain = .{ .sType = c.WGPUSType_ShaderSourceWGSL },
|
|
||||||
.code = sv(wgsl),
|
|
||||||
};
|
|
||||||
const shader = c.wgpuDeviceCreateShaderModule(device, &.{
|
|
||||||
.nextInChain = @ptrCast(&wgsl_src),
|
|
||||||
}) orelse return error.Shader;
|
|
||||||
defer c.wgpuShaderModuleRelease(shader);
|
|
||||||
|
|
||||||
return c.wgpuDeviceCreateComputePipeline(device, &.{
|
|
||||||
.compute = .{ .module = shader, .entryPoint = sv("main") },
|
|
||||||
}) orelse error.Pipeline;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn sv(s: []const u8) c.WGPUStringView {
|
pub fn freeTexture(self: @This(), raw: c.WGPUTexture) void {
|
||||||
return .{ .data = s.ptr, .length = s.len };
|
self.vtable.freeTexture(self.ptr, raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn allocTextureView(self: @This(), texture: c.WGPUTexture, desc: c.WGPUTextureViewDescriptor) !c.WGPUTextureView {
|
||||||
|
return self.vtable.allocTextureView(self.ptr, texture, desc);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn freeTextureView(self: @This(), raw: c.WGPUTextureView) void {
|
||||||
|
self.vtable.freeTextureView(self.ptr, raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn allocRenderPipeline(self: @This(), desc: c.WGPURenderPipelineDescriptor) !c.WGPURenderPipeline {
|
||||||
|
return self.vtable.allocRenderPipeline(self.ptr, desc);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn freeRenderPipeline(self: @This(), raw: c.WGPURenderPipeline) void {
|
||||||
|
self.vtable.freeRenderPipeline(self.ptr, raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn allocComputePipeline(self: @This(), desc: c.WGPUComputePipelineDescriptor) !c.WGPUComputePipeline {
|
||||||
|
return self.vtable.allocComputePipeline(self.ptr, desc);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn freeComputePipeline(self: @This(), raw: c.WGPUComputePipeline) void {
|
||||||
|
self.vtable.freeComputePipeline(self.ptr, raw);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,214 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const GpuDevice = @import("GpuDevice.zig");
|
||||||
|
const GpuAllocator = @import("GpuAllocator.zig");
|
||||||
|
const GpuTextureFormat = @import("lib.zig").GpuTextureFormat;
|
||||||
|
const c = @import("utils.zig").c;
|
||||||
|
const viewStr = @import("utils.zig").viewStr;
|
||||||
|
|
||||||
|
child_allocator: GpuAllocator, // I use Zig naming child_allocator, but that should be a parent for me. Likely something idk
|
||||||
|
tracked_buffers: std.AutoHashMap(c.WGPUBuffer, c.WGPUBufferDescriptor),
|
||||||
|
tracked_textures: std.AutoHashMap(c.WGPUTexture, c.WGPUTextureDescriptor),
|
||||||
|
tracked_views: std.AutoHashMap(c.WGPUTextureView, c.WGPUTextureViewDescriptor),
|
||||||
|
tracked_renders: std.AutoHashMap(c.WGPURenderPipeline, c.WGPURenderPipelineDescriptor),
|
||||||
|
tracked_computes: std.AutoHashMap(c.WGPUComputePipeline, c.WGPUComputePipelineDescriptor),
|
||||||
|
allocated_vram_bytes: u64 = 0,
|
||||||
|
|
||||||
|
pub fn init(cpu_allocator: std.mem.Allocator, child_allocator: GpuAllocator) @This() {
|
||||||
|
return .{
|
||||||
|
.child_allocator = child_allocator,
|
||||||
|
.tracked_buffers = .init(cpu_allocator),
|
||||||
|
.tracked_textures = .init(cpu_allocator),
|
||||||
|
.tracked_views = .init(cpu_allocator),
|
||||||
|
.tracked_computes = .init(cpu_allocator),
|
||||||
|
.tracked_renders = .init(cpu_allocator),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deinit(self: *@This()) void {
|
||||||
|
std.log.debug("Freeing GpuArenaAllocator (Used VRAM: {}/{} MB)", .{
|
||||||
|
self.allocated_vram_bytes / 1024 / 1024,
|
||||||
|
self.child_allocator.device.def.vram_bytes_limit / 1024 / 1024,
|
||||||
|
});
|
||||||
|
|
||||||
|
var it_buffer = self.tracked_buffers.keyIterator();
|
||||||
|
while (it_buffer.next()) |buf_ptr|
|
||||||
|
freeBuffer(self, buf_ptr.*);
|
||||||
|
self.tracked_buffers.deinit();
|
||||||
|
|
||||||
|
var it_tex = self.tracked_textures.keyIterator();
|
||||||
|
while (it_tex.next()) |buf_ptr|
|
||||||
|
freeTexture(self, buf_ptr.*);
|
||||||
|
self.tracked_textures.deinit();
|
||||||
|
|
||||||
|
var it_view = self.tracked_views.keyIterator();
|
||||||
|
while (it_view.next()) |buf_ptr|
|
||||||
|
freeTextureView(self, buf_ptr.*);
|
||||||
|
self.tracked_views.deinit();
|
||||||
|
|
||||||
|
var it_render = self.tracked_renders.keyIterator();
|
||||||
|
while (it_render.next()) |buf_ptr|
|
||||||
|
freeRenderPipeline(self, buf_ptr.*);
|
||||||
|
self.tracked_renders.deinit();
|
||||||
|
|
||||||
|
var it_compute = self.tracked_computes.keyIterator();
|
||||||
|
while (it_compute.next()) |buf_ptr|
|
||||||
|
freeComputePipeline(self, buf_ptr.*);
|
||||||
|
self.tracked_computes.deinit();
|
||||||
|
|
||||||
|
std.log.debug("Freed GpuArenaAllocator (Used VRAM: {}/{} MB)", .{
|
||||||
|
self.allocated_vram_bytes / 1024 / 1024,
|
||||||
|
self.child_allocator.device.def.vram_bytes_limit / 1024 / 1024,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns the type-erased immutable interface wrapper
|
||||||
|
pub fn gpuAllocator(self: *@This()) GpuAllocator {
|
||||||
|
return .{
|
||||||
|
.device = self.child_allocator.device,
|
||||||
|
.ptr = self,
|
||||||
|
.vtable = &.{
|
||||||
|
.allocBuffer = allocBuffer,
|
||||||
|
.freeBuffer = freeBuffer,
|
||||||
|
.allocTexture = allocTexture,
|
||||||
|
.freeTexture = freeTexture,
|
||||||
|
.allocTextureView = allocTextureView,
|
||||||
|
.freeTextureView = freeTextureView,
|
||||||
|
.allocRenderPipeline = allocRenderPipeline,
|
||||||
|
.freeRenderPipeline = freeRenderPipeline,
|
||||||
|
.allocComputePipeline = allocComputePipeline,
|
||||||
|
.freeComputePipeline = freeComputePipeline,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE: I use ensureTotalCapacity so I know that try self.tracked_x.put will not fail!
|
||||||
|
// Like that I dont have to use errdefer to release what I just allocated in VRAM
|
||||||
|
|
||||||
|
fn allocBuffer(ctx: *anyopaque, desc: c.WGPUBufferDescriptor) anyerror!c.WGPUBuffer {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
try self.tracked_buffers.ensureTotalCapacity(self.tracked_buffers.count() + 1);
|
||||||
|
const raw = try self.child_allocator.allocBuffer(desc);
|
||||||
|
self.tracked_buffers.putAssumeCapacity(raw, desc);
|
||||||
|
self.allocated_vram_bytes += desc.size;
|
||||||
|
|
||||||
|
std.log.debug("Allocated Buffer '{s}': {d} B (Total VRAM: {}/{} MB)", .{
|
||||||
|
viewStr(desc.label),
|
||||||
|
desc.size,
|
||||||
|
self.allocated_vram_bytes / 1024 / 1024,
|
||||||
|
self.child_allocator.device.def.vram_bytes_limit / 1024 / 1024,
|
||||||
|
});
|
||||||
|
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeBuffer(ctx: *anyopaque, raw: c.WGPUBuffer) void {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
if (self.tracked_buffers.fetchRemove(raw)) |kv| {
|
||||||
|
self.child_allocator.freeBuffer(raw);
|
||||||
|
self.allocated_vram_bytes -= kv.value.size;
|
||||||
|
|
||||||
|
std.log.debug("Freed Buffer '{s}' (Total VRAM: {}/{} MB)", .{
|
||||||
|
viewStr(kv.value.label),
|
||||||
|
self.allocated_vram_bytes / 1024 / 1024,
|
||||||
|
self.child_allocator.device.def.vram_bytes_limit / 1024 / 1024,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocTexture(ctx: *anyopaque, desc: c.WGPUTextureDescriptor) anyerror!c.WGPUTexture {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
try self.tracked_textures.ensureTotalCapacity(self.tracked_textures.count() + 1);
|
||||||
|
|
||||||
|
const format: GpuTextureFormat = @enumFromInt(desc.format);
|
||||||
|
const bytes_size = desc.size.width * desc.size.height * format.bytesPerPixel();
|
||||||
|
|
||||||
|
if (bytes_size + self.allocated_vram_bytes > self.child_allocator.device.def.vram_bytes_limit)
|
||||||
|
return error.ExceedsVramBudget;
|
||||||
|
|
||||||
|
const raw = try self.child_allocator.allocTexture(desc);
|
||||||
|
|
||||||
|
self.tracked_textures.putAssumeCapacity(raw, desc);
|
||||||
|
self.allocated_vram_bytes += bytes_size;
|
||||||
|
|
||||||
|
std.log.debug("Allocated Texture '{s}': {d} B (Total VRAM: {}/{} MB)", .{
|
||||||
|
viewStr(desc.label),
|
||||||
|
bytes_size,
|
||||||
|
self.allocated_vram_bytes / 1024 / 1024,
|
||||||
|
self.child_allocator.device.def.vram_bytes_limit / 1024 / 1024,
|
||||||
|
});
|
||||||
|
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeTexture(ctx: *anyopaque, raw: c.WGPUTexture) void {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
|
||||||
|
if (self.tracked_textures.fetchRemove(raw)) |kv| {
|
||||||
|
self.child_allocator.freeTexture(raw);
|
||||||
|
|
||||||
|
const desc = kv.value;
|
||||||
|
const format: GpuTextureFormat = @enumFromInt(desc.format);
|
||||||
|
const bytes_size = desc.size.width * desc.size.height * format.bytesPerPixel();
|
||||||
|
self.allocated_vram_bytes -= bytes_size;
|
||||||
|
|
||||||
|
std.log.debug("Freed Texture '{s}' (Total VRAM: {}/{} MB)", .{
|
||||||
|
viewStr(desc.label),
|
||||||
|
self.allocated_vram_bytes / 1024 / 1024,
|
||||||
|
self.child_allocator.device.def.vram_bytes_limit / 1024 / 1024,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocTextureView(ctx: *anyopaque, texture: c.WGPUTexture, desc: c.WGPUTextureViewDescriptor) anyerror!c.WGPUTextureView {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
try self.tracked_views.ensureTotalCapacity(self.tracked_views.count() + 1);
|
||||||
|
const raw = try self.child_allocator.allocTextureView(texture, desc);
|
||||||
|
self.tracked_views.putAssumeCapacity(raw, desc);
|
||||||
|
std.log.debug("Allocated Texture View '{s}'", .{viewStr(desc.label)});
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeTextureView(ctx: *anyopaque, raw: c.WGPUTextureView) void {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
if (self.tracked_views.fetchRemove(raw)) |kv| {
|
||||||
|
self.child_allocator.freeTextureView(raw);
|
||||||
|
const desc = kv.value;
|
||||||
|
std.log.debug("Freed Texture View '{s}'", .{viewStr(desc.label)});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocRenderPipeline(ctx: *anyopaque, desc: c.WGPURenderPipelineDescriptor) anyerror!c.WGPURenderPipeline {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
try self.tracked_renders.ensureTotalCapacity(self.tracked_renders.count() + 1);
|
||||||
|
const raw = try self.child_allocator.allocRenderPipeline(desc);
|
||||||
|
self.tracked_renders.putAssumeCapacity(raw, desc);
|
||||||
|
std.log.debug("Allocated Render Pipeline '{s}'", .{viewStr(desc.label)});
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeRenderPipeline(ctx: *anyopaque, raw: c.WGPURenderPipeline) void {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
if (self.tracked_renders.fetchRemove(raw)) |kv| {
|
||||||
|
self.child_allocator.freeRenderPipeline(raw);
|
||||||
|
const desc = kv.value;
|
||||||
|
std.log.debug("Freed Render Pipeline '{s}'", .{viewStr(desc.label)});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocComputePipeline(ctx: *anyopaque, desc: c.WGPUComputePipelineDescriptor) anyerror!c.WGPUComputePipeline {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
try self.tracked_computes.ensureTotalCapacity(self.tracked_computes.count() + 1);
|
||||||
|
const raw = try self.child_allocator.allocComputePipeline(desc);
|
||||||
|
self.tracked_computes.putAssumeCapacity(raw, desc);
|
||||||
|
std.log.debug("Allocated Compute Pipeline '{s}'", .{viewStr(desc.label)});
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeComputePipeline(ctx: *anyopaque, raw: c.WGPUComputePipeline) void {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
if (self.tracked_computes.fetchRemove(raw)) |kv| {
|
||||||
|
self.child_allocator.freeComputePipeline(raw);
|
||||||
|
const desc = kv.value;
|
||||||
|
std.log.debug("Freed Compute Pipeline '{s}'", .{viewStr(desc.label)});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const c = @import("utils.zig").c;
|
||||||
|
const GpuAllocator = @import("GpuAllocator.zig");
|
||||||
|
const svOpt = @import("utils.zig").svOpt;
|
||||||
|
|
||||||
|
raw: c.WGPUBuffer,
|
||||||
|
size: u64,
|
||||||
|
usage: c.WGPUBufferUsage,
|
||||||
|
glloc: GpuAllocator,
|
||||||
|
|
||||||
|
const BufferUsage = enum(u64) {
|
||||||
|
None = 0x0000000000000000,
|
||||||
|
MapRead = 0x0000000000000001,
|
||||||
|
MapWrite = 0x0000000000000002,
|
||||||
|
CopySrc = 0x0000000000000004,
|
||||||
|
CopyDst = 0x0000000000000008,
|
||||||
|
Index = 0x0000000000000010,
|
||||||
|
Vertex = 0x0000000000000020,
|
||||||
|
Uniform = 0x0000000000000040,
|
||||||
|
Storage = 0x0000000000000080,
|
||||||
|
Indirect = 0x0000000000000100,
|
||||||
|
QueryResolve = 0x0000000000000200,
|
||||||
|
};
|
||||||
|
|
||||||
|
const GpuBufferDef = struct {
|
||||||
|
label: ?[]const u8 = null,
|
||||||
|
size: u64,
|
||||||
|
usage: std.EnumSet(BufferUsage),
|
||||||
|
};
|
||||||
|
|
||||||
|
pub fn init(glloc: GpuAllocator, def: GpuBufferDef) !@This() {
|
||||||
|
var use: u64 = 0;
|
||||||
|
var iter = def.usage.iterator();
|
||||||
|
while (iter.next()) |flag| use |= @intFromEnum(flag);
|
||||||
|
|
||||||
|
// Automatically align the buffer size forward to a multiple of 4 bytes under the hood
|
||||||
|
const aligned_size = std.mem.alignForward(u64, def.size, 4);
|
||||||
|
|
||||||
|
const raw_handle = try glloc.allocBuffer(.{
|
||||||
|
.size = aligned_size,
|
||||||
|
.usage = use,
|
||||||
|
.label = svOpt(def.label),
|
||||||
|
});
|
||||||
|
return .{
|
||||||
|
.raw = raw_handle,
|
||||||
|
.size = aligned_size,
|
||||||
|
.usage = use,
|
||||||
|
.glloc = glloc,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deinit(self: @This()) void {
|
||||||
|
self.glloc.freeBuffer(self.raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn getConstMappedRange(self: @This(), offset: u64, size: u64) ?*const anyopaque {
|
||||||
|
return c.wgpuBufferGetConstMappedRange(self.raw, offset, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn mapAsync(
|
||||||
|
self: @This(),
|
||||||
|
mode: c.WGPUMapMode,
|
||||||
|
offset: u64,
|
||||||
|
size: u64,
|
||||||
|
callback_info: c.WGPUBufferMapCallbackInfo,
|
||||||
|
) void {
|
||||||
|
_ = c.wgpuBufferMapAsync(self.raw, mode, offset, size, callback_info);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn unmap(self: @This()) void {
|
||||||
|
c.wgpuBufferUnmap(self.raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// CPU to GPU
|
||||||
|
pub fn load(
|
||||||
|
self: @This(),
|
||||||
|
T: type,
|
||||||
|
data: []const T,
|
||||||
|
) !void {
|
||||||
|
const bytes = data.len * @sizeOf(T);
|
||||||
|
|
||||||
|
if (bytes == self.size) {
|
||||||
|
// Aligned path: direct download
|
||||||
|
c.wgpuQueueWriteBuffer(self.glloc.device.queue, self.raw, 0, data.ptr, self.size);
|
||||||
|
} else {
|
||||||
|
// Unaligned path: Split the write into an aligned chunk and a padded remainder
|
||||||
|
// to support arbitrary lengths without any allocations or large stack arrays.
|
||||||
|
const aligned_part = (bytes / 4) * 4;
|
||||||
|
if (aligned_part > 0) {
|
||||||
|
c.wgpuQueueWriteBuffer(self.glloc.device.queue, self.raw, 0, data.ptr, aligned_part);
|
||||||
|
}
|
||||||
|
|
||||||
|
var remainder_buf: [4]u8 = .{ 0, 0, 0, 0 };
|
||||||
|
const data_bytes = std.mem.sliceAsBytes(data);
|
||||||
|
@memcpy(remainder_buf[0 .. bytes - aligned_part], data_bytes[aligned_part..bytes]);
|
||||||
|
|
||||||
|
c.wgpuQueueWriteBuffer(self.glloc.device.queue, self.raw, aligned_part, &remainder_buf, 4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// GPU to CPU
|
||||||
|
pub fn read(self: @This(), alloc: std.mem.Allocator, T: type) ![]T {
|
||||||
|
const out = try alloc.alloc(T, @divExact(self.size, @sizeOf(T)));
|
||||||
|
|
||||||
|
const staging = try init(self.glloc, .{
|
||||||
|
.size = self.size,
|
||||||
|
.usage = .initMany(&.{ .MapRead, .CopyDst }),
|
||||||
|
.label = "staging_read_buffer",
|
||||||
|
});
|
||||||
|
defer staging.deinit();
|
||||||
|
|
||||||
|
const enc = c.wgpuDeviceCreateCommandEncoder(self.glloc.device.device, null) orelse return error.Encoder;
|
||||||
|
c.wgpuCommandEncoderCopyBufferToBuffer(enc, self.raw, 0, staging.raw, 0, self.size);
|
||||||
|
const cmd = c.wgpuCommandEncoderFinish(enc, null);
|
||||||
|
defer c.wgpuCommandEncoderRelease(enc);
|
||||||
|
defer c.wgpuCommandBufferRelease(cmd);
|
||||||
|
c.wgpuQueueSubmit(self.glloc.device.queue, 1, &cmd);
|
||||||
|
|
||||||
|
var mapped = false;
|
||||||
|
staging.mapAsync(
|
||||||
|
c.WGPUMapMode_Read,
|
||||||
|
0,
|
||||||
|
self.size,
|
||||||
|
.{ .callback = onMapped, .userdata1 = &mapped },
|
||||||
|
);
|
||||||
|
while (!mapped) self.glloc.device.poll();
|
||||||
|
|
||||||
|
const ptr: [*]const T = @ptrCast(@alignCast(
|
||||||
|
staging.getConstMappedRange(0, self.size),
|
||||||
|
));
|
||||||
|
@memcpy(out[0..out.len], ptr[0..out.len]);
|
||||||
|
staging.unmap();
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn onMapped(
|
||||||
|
status: c.WGPUMapAsyncStatus,
|
||||||
|
_: c.WGPUStringView,
|
||||||
|
userdata1: ?*anyopaque,
|
||||||
|
_: ?*anyopaque,
|
||||||
|
) callconv(.c) void {
|
||||||
|
const flag: *bool = @ptrCast(@alignCast(userdata1.?));
|
||||||
|
flag.* = (status == c.WGPUMapAsyncStatus_Success);
|
||||||
|
}
|
||||||
@@ -0,0 +1,176 @@
|
|||||||
|
const c = @import("utils.zig").c;
|
||||||
|
const sv = @import("utils.zig").sv;
|
||||||
|
const svOpt = @import("utils.zig").svOpt;
|
||||||
|
const GpuAllocator = @import("GpuAllocator.zig");
|
||||||
|
const GpuBuffer = @import("GpuBuffer.zig");
|
||||||
|
const GpuDevice = @import("GpuDevice.zig");
|
||||||
|
|
||||||
|
pub const Binding = struct {
|
||||||
|
/// Element size in bytes for this binding. E.g. @sizeOf(f32).
|
||||||
|
/// If 0, no element-based size validation is performed for this buffer.
|
||||||
|
element_size: u32 = 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub const ComputeDef = struct {
|
||||||
|
label: ?[]const u8 = null,
|
||||||
|
bindings: []const Binding,
|
||||||
|
workgroup_size: u32 = 256,
|
||||||
|
max_workgroups: u32 = 65535,
|
||||||
|
/// If true, automatically adds a Uniform Buffer containing `elements_count` as a `u32`
|
||||||
|
/// to the next available binding slot.
|
||||||
|
append_info_buffer: bool = true,
|
||||||
|
};
|
||||||
|
|
||||||
|
pip: c.WGPUComputePipeline,
|
||||||
|
glloc: GpuAllocator,
|
||||||
|
def: ComputeDef,
|
||||||
|
|
||||||
|
pub fn init(glloc: GpuAllocator, wgsl: []const u8, def: ComputeDef) !@This() {
|
||||||
|
var wgsl_src = c.WGPUShaderSourceWGSL{
|
||||||
|
.chain = .{ .sType = c.WGPUSType_ShaderSourceWGSL },
|
||||||
|
.code = sv(wgsl),
|
||||||
|
};
|
||||||
|
const shader = c.wgpuDeviceCreateShaderModule(glloc.device.device, &.{
|
||||||
|
.nextInChain = @ptrCast(&wgsl_src),
|
||||||
|
}) orelse return error.Shader;
|
||||||
|
defer c.wgpuShaderModuleRelease(shader);
|
||||||
|
|
||||||
|
const pip = try glloc.allocComputePipeline(.{
|
||||||
|
.label = svOpt(def.label),
|
||||||
|
.compute = .{ .module = shader, .entryPoint = sv("main") },
|
||||||
|
});
|
||||||
|
|
||||||
|
return .{
|
||||||
|
.glloc = glloc,
|
||||||
|
.pip = pip,
|
||||||
|
.def = def,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deinit(self: @This()) void {
|
||||||
|
self.glloc.freeComputePipeline(self.pip);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Execute the compute pass with arbitrary buffer bindings via a tuple.
|
||||||
|
/// Example: `try proc.run(glloc, .{ buf_a, buf_b, buf_out });`
|
||||||
|
pub fn run(
|
||||||
|
self: @This(),
|
||||||
|
glloc: GpuAllocator,
|
||||||
|
args: anytype,
|
||||||
|
) !void {
|
||||||
|
const type_info = @typeInfo(@TypeOf(args));
|
||||||
|
if (type_info != .@"struct" or !type_info.@"struct".is_tuple)
|
||||||
|
@compileError("Expected a tuple of GpuBuffers for args. E.g. .{ buf_a, buf_b }");
|
||||||
|
|
||||||
|
const fields = type_info.@"struct".fields;
|
||||||
|
if (fields.len != self.def.bindings.len)
|
||||||
|
return error.InvalidArgumentCount;
|
||||||
|
|
||||||
|
var elements_count: u32 = 0;
|
||||||
|
|
||||||
|
// Infer elements_count from the first arg with a defined element_size
|
||||||
|
inline for (fields, 0..) |field, i| {
|
||||||
|
if (elements_count == 0) {
|
||||||
|
const buf = @field(args, field.name);
|
||||||
|
const el_size = self.def.bindings[i].element_size;
|
||||||
|
if (el_size > 0) {
|
||||||
|
elements_count = @intCast(buf.size / el_size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate runtime buffer sizes before dispatching
|
||||||
|
inline for (fields, 0..) |field, i| {
|
||||||
|
const buf = @field(args, field.name);
|
||||||
|
const el_size = self.def.bindings[i].element_size;
|
||||||
|
if (el_size > 0) {
|
||||||
|
const expected_min_bytes = @as(u64, elements_count) * el_size;
|
||||||
|
if (buf.size < expected_min_bytes)
|
||||||
|
return error.BufferTooSmall;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var entries_buf: [32]c.WGPUBindGroupEntry = undefined;
|
||||||
|
var entry_count: usize = 0;
|
||||||
|
|
||||||
|
// Unpack tuple into WebGPU BindGroupEntries
|
||||||
|
inline for (fields, 0..) |field, i| {
|
||||||
|
const buf = @field(args, field.name);
|
||||||
|
if (@TypeOf(buf) != GpuBuffer) {
|
||||||
|
@compileError("All arguments in the tuple must be of type GpuBuffer");
|
||||||
|
}
|
||||||
|
entries_buf[entry_count] = .{
|
||||||
|
.binding = @intCast(i),
|
||||||
|
.buffer = buf.raw,
|
||||||
|
.offset = 0,
|
||||||
|
.size = buf.size, // Size exposes the fully allocated length
|
||||||
|
};
|
||||||
|
entry_count += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optional uniform dispatch buffer appended at the end
|
||||||
|
var info_buf: ?GpuBuffer = null;
|
||||||
|
defer if (info_buf) |b| b.deinit();
|
||||||
|
|
||||||
|
if (self.def.append_info_buffer) {
|
||||||
|
info_buf = try GpuBuffer.init(glloc, .{
|
||||||
|
.size = @sizeOf(u32),
|
||||||
|
.usage = .initMany(&.{ .Uniform, .CopyDst }),
|
||||||
|
.label = "compute_info_buffer",
|
||||||
|
});
|
||||||
|
c.wgpuQueueWriteBuffer(glloc.device.queue, info_buf.?.raw, 0, &elements_count, @sizeOf(u32));
|
||||||
|
|
||||||
|
entries_buf[entry_count] = .{
|
||||||
|
.binding = @intCast(entry_count),
|
||||||
|
.buffer = info_buf.?.raw,
|
||||||
|
.offset = 0,
|
||||||
|
.size = @sizeOf(u32),
|
||||||
|
};
|
||||||
|
entry_count += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const entries = entries_buf[0..entry_count];
|
||||||
|
try submitPass(glloc, self.pip, entries, elements_count, self.def.workgroup_size, self.def.max_workgroups);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn submitPass(
|
||||||
|
glloc: GpuAllocator,
|
||||||
|
pipeline: c.WGPUComputePipeline,
|
||||||
|
entries: []const c.WGPUBindGroupEntry,
|
||||||
|
n: usize,
|
||||||
|
workgroup_size: u32,
|
||||||
|
max_workgroups: u32,
|
||||||
|
) !void {
|
||||||
|
if (n == 0) return;
|
||||||
|
|
||||||
|
const bgl = c.wgpuComputePipelineGetBindGroupLayout(pipeline, 0);
|
||||||
|
defer c.wgpuBindGroupLayoutRelease(bgl);
|
||||||
|
|
||||||
|
const bg = c.wgpuDeviceCreateBindGroup(glloc.device.device, &.{
|
||||||
|
.layout = bgl,
|
||||||
|
.entries = entries.ptr,
|
||||||
|
.entryCount = entries.len,
|
||||||
|
}) orelse return error.BindGroup;
|
||||||
|
defer c.wgpuBindGroupRelease(bg);
|
||||||
|
|
||||||
|
const enc = c.wgpuDeviceCreateCommandEncoder(glloc.device.device, null) orelse return error.Encoder;
|
||||||
|
const pass = c.wgpuCommandEncoderBeginComputePass(enc, null);
|
||||||
|
c.wgpuComputePassEncoderSetPipeline(pass, pipeline);
|
||||||
|
c.wgpuComputePassEncoderSetBindGroup(pass, 0, bg, 0, null);
|
||||||
|
|
||||||
|
const desired_workgroups = ceilDiv(n, workgroup_size);
|
||||||
|
const dispatch_count = @min(desired_workgroups, max_workgroups);
|
||||||
|
|
||||||
|
c.wgpuComputePassEncoderDispatchWorkgroups(pass, @intCast(dispatch_count), 1, 1);
|
||||||
|
c.wgpuComputePassEncoderEnd(pass);
|
||||||
|
c.wgpuComputePassEncoderRelease(pass);
|
||||||
|
|
||||||
|
const cmd = c.wgpuCommandEncoderFinish(enc, null);
|
||||||
|
defer c.wgpuCommandEncoderRelease(enc);
|
||||||
|
defer c.wgpuCommandBufferRelease(cmd);
|
||||||
|
c.wgpuQueueSubmit(glloc.device.queue, 1, &cmd);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ceilDiv(n: usize, d: usize) usize {
|
||||||
|
return (n + d - 1) / d;
|
||||||
|
}
|
||||||
@@ -0,0 +1,224 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const c = @import("utils.zig").c;
|
||||||
|
const sv = @import("utils.zig").sv;
|
||||||
|
const svOpt = @import("utils.zig").svOpt;
|
||||||
|
const GpuAllocator = @import("GpuAllocator.zig");
|
||||||
|
const GpuTextureFormat = @import("lib.zig").GpuTextureFormat;
|
||||||
|
|
||||||
|
const Ctx = struct {
|
||||||
|
adapter: c.WGPUAdapter = null,
|
||||||
|
device: c.WGPUDevice = null,
|
||||||
|
};
|
||||||
|
|
||||||
|
const GpuDeviceDef = struct {
|
||||||
|
label: ?[]const u8 = null,
|
||||||
|
/// VRAM limit. Default 2 GB
|
||||||
|
vram_bytes_limit: u64 = 2 * 1024 * 1024 * 1024,
|
||||||
|
power_preference: enum(c_uint) {
|
||||||
|
Undefined = 0x00000000,
|
||||||
|
LowPower = 0x00000001,
|
||||||
|
HighPerformance = 0x00000002,
|
||||||
|
Force32 = 0x7FFFFFFF,
|
||||||
|
} = .HighPerformance,
|
||||||
|
};
|
||||||
|
|
||||||
|
instance: c.WGPUInstance,
|
||||||
|
adapter: c.WGPUAdapter,
|
||||||
|
device: c.WGPUDevice,
|
||||||
|
queue: c.WGPUQueue,
|
||||||
|
limits: c.WGPULimits,
|
||||||
|
|
||||||
|
def: GpuDeviceDef,
|
||||||
|
|
||||||
|
pub fn init(def: GpuDeviceDef) !@This() {
|
||||||
|
const instance = c.wgpuCreateInstance(
|
||||||
|
&std.mem.zeroes(c.WGPUInstanceDescriptor),
|
||||||
|
) orelse return error.NoInstance;
|
||||||
|
errdefer c.wgpuInstanceRelease(instance);
|
||||||
|
|
||||||
|
var ctx = Ctx{};
|
||||||
|
_ = c.wgpuInstanceRequestAdapter(
|
||||||
|
instance,
|
||||||
|
&.{ .powerPreference = @intFromEnum(def.power_preference) },
|
||||||
|
.{ .callback = onAdapter, .userdata1 = &ctx },
|
||||||
|
);
|
||||||
|
c.wgpuInstanceProcessEvents(instance);
|
||||||
|
const adapter = ctx.adapter orelse return error.NoAdapter;
|
||||||
|
errdefer c.wgpuAdapterRelease(adapter);
|
||||||
|
|
||||||
|
var adapter_info = std.mem.zeroes(c.WGPUAdapterInfo);
|
||||||
|
_ = c.wgpuAdapterGetInfo(adapter, &adapter_info);
|
||||||
|
|
||||||
|
std.log.info("=== WebGPU Device Initialized ===", .{});
|
||||||
|
if (adapter_info.device.length > 0 and adapter_info.device.data != null) {
|
||||||
|
std.log.info(" Device Name : {s}", .{adapter_info.device.data[0..adapter_info.device.length]});
|
||||||
|
}
|
||||||
|
if (adapter_info.architecture.length > 0 and adapter_info.architecture.data != null) {
|
||||||
|
std.log.info(" Architecture : {s}", .{adapter_info.architecture.data[0..adapter_info.architecture.length]});
|
||||||
|
}
|
||||||
|
std.log.info(" Backend Type : {d}", .{adapter_info.backendType});
|
||||||
|
|
||||||
|
var supported_features = std.mem.zeroes(c.WGPUSupportedFeatures);
|
||||||
|
c.wgpuAdapterGetFeatures(adapter, &supported_features);
|
||||||
|
|
||||||
|
var supported_limits = std.mem.zeroes(c.WGPULimits);
|
||||||
|
supported_limits.nextInChain = null;
|
||||||
|
if (c.wgpuAdapterGetLimits(adapter, &supported_limits) != 1) return error.FailedToGetAdapterLimits;
|
||||||
|
|
||||||
|
std.log.info(" Max Buf Size : {d} MB", .{supported_limits.maxBufferSize / 1024 / 1024});
|
||||||
|
std.log.info(" Max Storage : {d} MB", .{supported_limits.maxStorageBufferBindingSize / 1024 / 1024});
|
||||||
|
std.log.info(" Max Workgroup: X: {d}, Y: {d}, Z: {d}", .{ supported_limits.maxComputeWorkgroupSizeX, supported_limits.maxComputeWorkgroupSizeY, supported_limits.maxComputeWorkgroupSizeZ });
|
||||||
|
std.log.info(" VRAM Budget : {d} MB", .{def.vram_bytes_limit / 1024 / 1024});
|
||||||
|
|
||||||
|
var has_f16 = false;
|
||||||
|
for (0..supported_features.featureCount) |i| {
|
||||||
|
if (supported_features.features[i] == c.WGPUFeatureName_ShaderF16) {
|
||||||
|
has_f16 = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
std.log.info(" Shader F16 : {}", .{has_f16});
|
||||||
|
std.log.info("=================================", .{});
|
||||||
|
|
||||||
|
var feature_buf = [_]c.WGPUFeatureName{c.WGPUFeatureName_ShaderF16};
|
||||||
|
const required_features: []const c.WGPUFeatureName =
|
||||||
|
if (has_f16) feature_buf[0..1] else &.{};
|
||||||
|
|
||||||
|
const device_descriptor = c.WGPUDeviceDescriptor{
|
||||||
|
.nextInChain = null,
|
||||||
|
.label = svOpt(def.label),
|
||||||
|
.requiredFeatureCount = required_features.len,
|
||||||
|
.requiredFeatures = if (required_features.len > 0) required_features.ptr else null,
|
||||||
|
.requiredLimits = &supported_limits,
|
||||||
|
};
|
||||||
|
_ = c.wgpuAdapterRequestDevice(
|
||||||
|
adapter,
|
||||||
|
&device_descriptor,
|
||||||
|
.{ .callback = onDevice, .userdata1 = &ctx },
|
||||||
|
);
|
||||||
|
c.wgpuInstanceProcessEvents(instance);
|
||||||
|
const device = ctx.device orelse return error.NoDevice;
|
||||||
|
|
||||||
|
return .{
|
||||||
|
.instance = instance,
|
||||||
|
.adapter = adapter,
|
||||||
|
.device = device,
|
||||||
|
.queue = c.wgpuDeviceGetQueue(device),
|
||||||
|
.limits = supported_limits,
|
||||||
|
.def = def,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deinit(self: @This()) void {
|
||||||
|
c.wgpuQueueRelease(self.queue);
|
||||||
|
c.wgpuDeviceRelease(self.device);
|
||||||
|
c.wgpuAdapterRelease(self.adapter);
|
||||||
|
c.wgpuInstanceRelease(self.instance);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Wait for thing to be done
|
||||||
|
pub fn poll(self: @This()) void {
|
||||||
|
_ = c.wgpuDevicePoll(self.device, 1, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn onAdapter(
|
||||||
|
status: c.WGPURequestAdapterStatus,
|
||||||
|
adapter: c.WGPUAdapter,
|
||||||
|
_: c.WGPUStringView,
|
||||||
|
userdata1: ?*anyopaque,
|
||||||
|
_: ?*anyopaque,
|
||||||
|
) callconv(.c) void {
|
||||||
|
if (status != c.WGPURequestAdapterStatus_Success) {
|
||||||
|
std.log.err("Adapter request failed (status={d})", .{status});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const ctx: *Ctx = @ptrCast(@alignCast(userdata1.?));
|
||||||
|
ctx.adapter = adapter;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn onDevice(
|
||||||
|
status: c.WGPURequestDeviceStatus,
|
||||||
|
device: c.WGPUDevice,
|
||||||
|
_: c.WGPUStringView,
|
||||||
|
userdata1: ?*anyopaque,
|
||||||
|
_: ?*anyopaque,
|
||||||
|
) callconv(.c) void {
|
||||||
|
if (status != c.WGPURequestDeviceStatus_Success) {
|
||||||
|
std.log.err("Device request failed (status={d})", .{status});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const ctx: *Ctx = @ptrCast(@alignCast(userdata1.?));
|
||||||
|
ctx.device = device;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocation stuff
|
||||||
|
|
||||||
|
/// Returns the type-erased immutable interface wrapper
|
||||||
|
pub fn gpuAllocator(self: *const @This()) GpuAllocator {
|
||||||
|
return .{
|
||||||
|
.device = self.*,
|
||||||
|
.ptr = @ptrCast(@constCast(self)),
|
||||||
|
.vtable = &.{
|
||||||
|
.allocBuffer = allocBuffer,
|
||||||
|
.freeBuffer = freeBuffer,
|
||||||
|
.allocTexture = allocTexture,
|
||||||
|
.freeTexture = freeTexture,
|
||||||
|
.allocTextureView = allocTextureView,
|
||||||
|
.freeTextureView = freeTextureView,
|
||||||
|
.allocRenderPipeline = allocRenderPipeline,
|
||||||
|
.freeRenderPipeline = freeRenderPipeline,
|
||||||
|
.allocComputePipeline = allocComputePipeline,
|
||||||
|
.freeComputePipeline = freeComputePipeline,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocBuffer(ctx: *anyopaque, desc: c.WGPUBufferDescriptor) anyerror!c.WGPUBuffer {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
if (desc.size > self.limits.maxBufferSize)
|
||||||
|
return error.SingleBufferExceedsLimit;
|
||||||
|
return c.wgpuDeviceCreateBuffer(self.device, &desc) orelse return error.BufferAlloc;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeBuffer(_: *anyopaque, raw: c.WGPUBuffer) void {
|
||||||
|
c.wgpuBufferDestroy(raw);
|
||||||
|
c.wgpuBufferRelease(raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocTexture(ctx: *anyopaque, desc: c.WGPUTextureDescriptor) anyerror!c.WGPUTexture {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
const format: GpuTextureFormat = @enumFromInt(desc.format);
|
||||||
|
if (desc.size.width * desc.size.height * format.bytesPerPixel() > self.limits.maxBufferSize)
|
||||||
|
return error.SingleBufferExceedsLimit;
|
||||||
|
return c.wgpuDeviceCreateTexture(self.device, &desc) orelse return error.Texture;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeTexture(_: *anyopaque, raw: c.WGPUTexture) void {
|
||||||
|
c.wgpuTextureRelease(raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocTextureView(_: *anyopaque, texture: c.WGPUTexture, desc: c.WGPUTextureViewDescriptor) anyerror!c.WGPUTextureView {
|
||||||
|
return c.wgpuTextureCreateView(texture, &desc) orelse return error.View;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeTextureView(_: *anyopaque, raw: c.WGPUTextureView) void {
|
||||||
|
c.wgpuTextureViewRelease(raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocRenderPipeline(ctx: *anyopaque, desc: c.WGPURenderPipelineDescriptor) anyerror!c.WGPURenderPipeline {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
return c.wgpuDeviceCreateRenderPipeline(self.device, &desc) orelse return error.Pipeline;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeRenderPipeline(_: *anyopaque, raw: c.WGPURenderPipeline) void {
|
||||||
|
c.wgpuRenderPipelineRelease(raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocComputePipeline(ctx: *anyopaque, desc: c.WGPUComputePipelineDescriptor) anyerror!c.WGPUComputePipeline {
|
||||||
|
const self: *@This() = @ptrCast(@alignCast(ctx));
|
||||||
|
return c.wgpuDeviceCreateComputePipeline(self.device, &desc) orelse return error.Pipeline;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn freeComputePipeline(_: *anyopaque, raw: c.WGPUComputePipeline) void {
|
||||||
|
c.wgpuComputePipelineRelease(raw);
|
||||||
|
}
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const c = @import("utils.zig").c;
|
||||||
|
const sv = @import("utils.zig").sv;
|
||||||
|
const svOpt = @import("utils.zig").svOpt;
|
||||||
|
const GpuAllocator = @import("GpuAllocator.zig");
|
||||||
|
const GpuBuffer = @import("GpuBuffer.zig");
|
||||||
|
const GpuDevice = @import("GpuDevice.zig");
|
||||||
|
const GpuTextureView = @import("GpuTextureView.zig");
|
||||||
|
const GpuTextureFormat = @import("lib.zig").GpuTextureFormat;
|
||||||
|
|
||||||
|
pub const Binding = struct {
|
||||||
|
element_size: u32 = 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub const GpuRenderDef = struct {
|
||||||
|
label: ?[]const u8 = null,
|
||||||
|
bindings: []const Binding = &.{},
|
||||||
|
/// The surface texture format we are rendering to (e.g., BGRA8Unorm)
|
||||||
|
texture_format: GpuTextureFormat,
|
||||||
|
/// The names of the entry points inside your WGSL code
|
||||||
|
vertex_entry: []const u8 = "vs_main",
|
||||||
|
fragment_entry: []const u8 = "fs_main",
|
||||||
|
/// Primitive topology, default to triangle list
|
||||||
|
topology: GpuPrimitiveTopology = .TriangleList,
|
||||||
|
};
|
||||||
|
|
||||||
|
const GpuPrimitiveTopology = enum(c_uint) {
|
||||||
|
Undefined = 0x00000000,
|
||||||
|
PointList = 0x00000001,
|
||||||
|
LineList = 0x00000002,
|
||||||
|
LineStrip = 0x00000003,
|
||||||
|
TriangleList = 0x00000004,
|
||||||
|
TriangleStrip = 0x00000005,
|
||||||
|
Force32 = 0x7FFFFFFF,
|
||||||
|
};
|
||||||
|
|
||||||
|
glloc: GpuAllocator,
|
||||||
|
pip: c.WGPURenderPipeline,
|
||||||
|
def: GpuRenderDef,
|
||||||
|
|
||||||
|
pub fn init(glloc: GpuAllocator, wgsl: []const u8, def: GpuRenderDef) !@This() {
|
||||||
|
var wgsl_src = c.WGPUShaderSourceWGSL{
|
||||||
|
.chain = .{ .sType = c.WGPUSType_ShaderSourceWGSL },
|
||||||
|
.code = sv(wgsl),
|
||||||
|
};
|
||||||
|
const shader = c.wgpuDeviceCreateShaderModule(glloc.device.device, &.{
|
||||||
|
.nextInChain = @ptrCast(&wgsl_src),
|
||||||
|
}) orelse return error.Shader;
|
||||||
|
defer c.wgpuShaderModuleRelease(shader);
|
||||||
|
|
||||||
|
// 1. Setup the Color Target State (where the fragment shader outputs)
|
||||||
|
const blend = c.WGPUBlendState{
|
||||||
|
.color = .{ .operation = c.WGPUBlendOperation_Add, .srcFactor = c.WGPUBlendFactor_SrcAlpha, .dstFactor = c.WGPUBlendFactor_OneMinusSrcAlpha },
|
||||||
|
.alpha = .{ .operation = c.WGPUBlendOperation_Add, .srcFactor = c.WGPUBlendFactor_One, .dstFactor = c.WGPUBlendFactor_Zero },
|
||||||
|
};
|
||||||
|
|
||||||
|
const color_target = c.WGPUColorTargetState{
|
||||||
|
.format = @intFromEnum(def.texture_format),
|
||||||
|
.blend = &blend,
|
||||||
|
.writeMask = c.WGPUColorWriteMask_All,
|
||||||
|
};
|
||||||
|
|
||||||
|
// 2. Setup the Fragment State
|
||||||
|
const fragment_state = c.WGPUFragmentState{
|
||||||
|
.module = shader,
|
||||||
|
.entryPoint = sv(def.fragment_entry),
|
||||||
|
.targetCount = 1,
|
||||||
|
.targets = &color_target,
|
||||||
|
};
|
||||||
|
|
||||||
|
// 3. Compile the Complete Render Pipeline
|
||||||
|
const pip = try glloc.allocRenderPipeline(.{
|
||||||
|
.label = svOpt(def.label),
|
||||||
|
.vertex = .{
|
||||||
|
.module = shader,
|
||||||
|
.entryPoint = sv(def.vertex_entry),
|
||||||
|
},
|
||||||
|
.primitive = .{
|
||||||
|
.topology = @intFromEnum(def.topology),
|
||||||
|
.stripIndexFormat = c.WGPUIndexFormat_Undefined,
|
||||||
|
.frontFace = c.WGPUFrontFace_CCW,
|
||||||
|
.cullMode = c.WGPUCullMode_None,
|
||||||
|
},
|
||||||
|
.multisample = .{
|
||||||
|
.count = 1,
|
||||||
|
.mask = 0xFFFFFFFF,
|
||||||
|
.alphaToCoverageEnabled = 0,
|
||||||
|
},
|
||||||
|
.fragment = &fragment_state,
|
||||||
|
});
|
||||||
|
|
||||||
|
return .{
|
||||||
|
.glloc = glloc,
|
||||||
|
.pip = pip,
|
||||||
|
.def = def,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deinit(self: @This()) void {
|
||||||
|
self.glloc.freeRenderPipeline(self.pip);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Execute the render pass targeting a specific frame texture view.
|
||||||
|
/// Passes bind groups via a tuple exactly like your original compute setup.
|
||||||
|
pub fn draw(
|
||||||
|
self: @This(),
|
||||||
|
glloc: GpuAllocator,
|
||||||
|
target_view: GpuTextureView,
|
||||||
|
vertex_count: u32,
|
||||||
|
args: anytype,
|
||||||
|
) !void {
|
||||||
|
const type_info = @typeInfo(@TypeOf(args));
|
||||||
|
if (type_info != .@"struct" or !type_info.@"struct".is_tuple)
|
||||||
|
@compileError("Expected a tuple of GpuBuffers for args. E.g. .{ uniform_buf }");
|
||||||
|
|
||||||
|
const fields = type_info.@"struct".fields;
|
||||||
|
if (fields.len != self.def.bindings.len)
|
||||||
|
return error.InvalidArgumentCount;
|
||||||
|
|
||||||
|
var entries_buf: [32]c.WGPUBindGroupEntry = undefined;
|
||||||
|
|
||||||
|
inline for (fields, 0..) |field, i| {
|
||||||
|
const buf = @field(args, field.name);
|
||||||
|
if (@TypeOf(buf) != GpuBuffer) {
|
||||||
|
@compileError("All arguments in the tuple must be of type GpuBuffer");
|
||||||
|
}
|
||||||
|
entries_buf[i] = .{
|
||||||
|
.binding = @intCast(i),
|
||||||
|
.buffer = buf.raw,
|
||||||
|
.offset = 0,
|
||||||
|
.size = buf.size,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const entries = entries_buf[0..fields.len];
|
||||||
|
|
||||||
|
// Create Render Bind Group from layout
|
||||||
|
const bgl = c.wgpuRenderPipelineGetBindGroupLayout(self.pip, 0);
|
||||||
|
defer c.wgpuBindGroupLayoutRelease(bgl);
|
||||||
|
|
||||||
|
const bg = c.wgpuDeviceCreateBindGroup(glloc.device.device, &.{
|
||||||
|
.layout = bgl,
|
||||||
|
.entries = entries.ptr,
|
||||||
|
.entryCount = @intCast(entries.len),
|
||||||
|
}) orelse return error.BindGroup;
|
||||||
|
defer c.wgpuBindGroupRelease(bg);
|
||||||
|
|
||||||
|
// Encode Render Command
|
||||||
|
const enc = c.wgpuDeviceCreateCommandEncoder(glloc.device.device, null) orelse return error.Encoder;
|
||||||
|
defer c.wgpuCommandEncoderRelease(enc);
|
||||||
|
|
||||||
|
const color_attachment = c.WGPURenderPassColorAttachment{
|
||||||
|
.view = target_view.raw,
|
||||||
|
.resolveTarget = null,
|
||||||
|
.loadOp = c.WGPULoadOp_Clear,
|
||||||
|
.storeOp = c.WGPUStoreOp_Store,
|
||||||
|
.clearValue = .{ .r = 0.1, .g = 0.1, .b = 0.1, .a = 1.0 },
|
||||||
|
.depthSlice = c.WGPU_DEPTH_SLICE_UNDEFINED,
|
||||||
|
};
|
||||||
|
|
||||||
|
const pass_desc = c.WGPURenderPassDescriptor{
|
||||||
|
.colorAttachmentCount = 1,
|
||||||
|
.colorAttachments = &color_attachment,
|
||||||
|
.depthStencilAttachment = null,
|
||||||
|
};
|
||||||
|
|
||||||
|
const pass = c.wgpuCommandEncoderBeginRenderPass(enc, &pass_desc);
|
||||||
|
c.wgpuRenderPassEncoderSetPipeline(pass, self.pip);
|
||||||
|
|
||||||
|
if (fields.len > 0) {
|
||||||
|
c.wgpuRenderPassEncoderSetBindGroup(pass, 0, bg, 0, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw! (Instead of Compute Dispatch)
|
||||||
|
c.wgpuRenderPassEncoderDraw(pass, vertex_count, 1, 0, 0);
|
||||||
|
|
||||||
|
c.wgpuRenderPassEncoderEnd(pass);
|
||||||
|
c.wgpuRenderPassEncoderRelease(pass);
|
||||||
|
|
||||||
|
const cmd = c.wgpuCommandEncoderFinish(enc, null);
|
||||||
|
defer c.wgpuCommandBufferRelease(cmd);
|
||||||
|
|
||||||
|
c.wgpuQueueSubmit(glloc.device.queue, 1, &cmd);
|
||||||
|
}
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const c = @import("utils.zig").c;
|
||||||
|
const svOpt = @import("utils.zig").svOpt;
|
||||||
|
const GpuAllocator = @import("GpuAllocator.zig");
|
||||||
|
const GpuBuffer = @import("GpuBuffer.zig");
|
||||||
|
const GpuTextureFormat = @import("lib.zig").GpuTextureFormat;
|
||||||
|
const GpuTextureUsage = @import("lib.zig").GpuTextureUsage;
|
||||||
|
|
||||||
|
pub const GpuTextureDef = struct {
|
||||||
|
label: ?[]const u8 = null,
|
||||||
|
size: c.WGPUExtent3D,
|
||||||
|
usage: std.EnumSet(GpuTextureUsage),
|
||||||
|
format: GpuTextureFormat,
|
||||||
|
};
|
||||||
|
|
||||||
|
raw: c.WGPUTexture,
|
||||||
|
glloc: GpuAllocator,
|
||||||
|
def: GpuTextureDef,
|
||||||
|
|
||||||
|
pub fn init(glloc: GpuAllocator, def: GpuTextureDef) !@This() {
|
||||||
|
var use: u64 = 0;
|
||||||
|
var iter = def.usage.iterator();
|
||||||
|
while (iter.next()) |flag| use |= @intFromEnum(flag);
|
||||||
|
|
||||||
|
const desc = c.WGPUTextureDescriptor{
|
||||||
|
.label = svOpt(def.label),
|
||||||
|
.usage = use,
|
||||||
|
.dimension = c.WGPUTextureDimension_2D,
|
||||||
|
.size = def.size,
|
||||||
|
.format = @intFromEnum(def.format),
|
||||||
|
.mipLevelCount = 1,
|
||||||
|
.sampleCount = 1,
|
||||||
|
};
|
||||||
|
const raw = try glloc.allocTexture(desc);
|
||||||
|
|
||||||
|
return .{ .glloc = glloc, .raw = raw, .def = def };
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deinit(self: @This()) void {
|
||||||
|
self.glloc.freeTexture(self.raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn getConstMappedRange(self: @This(), offset: u64, size: u64) ?*const anyopaque {
|
||||||
|
return c.wgpuBufferGetConstMappedRange(self.raw, offset, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn bytesSize(self: @This()) u32 {
|
||||||
|
return self.bytesSizeRow() * self.def.size.height;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn bytesSizeRow(self: @This()) u32 {
|
||||||
|
return self.def.size.width * self.def.format.bytesPerPixel();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Return a GpuBuffer containing a copy of the texture.
|
||||||
|
pub fn buffCopy(self: @This(), glloc: GpuAllocator) !GpuBuffer {
|
||||||
|
const buf = try GpuBuffer.init(glloc, .{
|
||||||
|
.size = self.bytesSize(),
|
||||||
|
.usage = .initMany(&.{ .CopyDst, .CopySrc }),
|
||||||
|
.label = "texture_copy_buffer",
|
||||||
|
});
|
||||||
|
|
||||||
|
const enc = c.wgpuDeviceCreateCommandEncoder(glloc.device.device, null) orelse return error.Encoder;
|
||||||
|
defer c.wgpuCommandEncoderRelease(enc);
|
||||||
|
|
||||||
|
const src_copy = c.WGPUTexelCopyTextureInfo{
|
||||||
|
.texture = self.raw,
|
||||||
|
.mipLevel = 0,
|
||||||
|
.origin = .{ .x = 0, .y = 0, .z = 0 },
|
||||||
|
.aspect = c.WGPUTextureAspect_All,
|
||||||
|
};
|
||||||
|
const dst_copy = c.WGPUTexelCopyBufferInfo{
|
||||||
|
.buffer = buf.raw,
|
||||||
|
.layout = .{
|
||||||
|
.offset = 0,
|
||||||
|
.bytesPerRow = self.bytesSizeRow(),
|
||||||
|
.rowsPerImage = self.def.size.height,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
c.wgpuCommandEncoderCopyTextureToBuffer(enc, &src_copy, &dst_copy, &self.def.size);
|
||||||
|
|
||||||
|
const cmd = c.wgpuCommandEncoderFinish(enc, null);
|
||||||
|
defer c.wgpuCommandBufferRelease(cmd);
|
||||||
|
c.wgpuQueueSubmit(glloc.device.queue, 1, &cmd);
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn mapAsync(
|
||||||
|
self: @This(),
|
||||||
|
mode: c.WGPUMapMode,
|
||||||
|
offset: u64,
|
||||||
|
size: u64,
|
||||||
|
callback_info: c.WGPUBufferMapCallbackInfo,
|
||||||
|
) void {
|
||||||
|
_ = c.wgpuBufferMapAsync(self.raw, mode, offset, size, callback_info);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn unmap(self: @This()) void {
|
||||||
|
c.wgpuBufferUnmap(self.raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// CPU to GPU
|
||||||
|
pub fn load(
|
||||||
|
self: @This(),
|
||||||
|
T: type,
|
||||||
|
data: []const T,
|
||||||
|
) !void {
|
||||||
|
const bytes = data.len * @sizeOf(T);
|
||||||
|
|
||||||
|
c.wgpuQueueWriteTexture(
|
||||||
|
self.glloc.device.queue,
|
||||||
|
&.{
|
||||||
|
.texture = self.raw,
|
||||||
|
.mipLevel = 0,
|
||||||
|
.origin = .{ .x = 0, .y = 0, .z = 0 },
|
||||||
|
.aspect = c.WGPUTextureAspect_All,
|
||||||
|
},
|
||||||
|
data.ptr,
|
||||||
|
bytes,
|
||||||
|
&.{
|
||||||
|
.offset = 0,
|
||||||
|
.bytesPerRow = self.bytesSizeRow(),
|
||||||
|
.rowsPerImage = self.def.size.height,
|
||||||
|
},
|
||||||
|
&self.def.size,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// GPU to CPU
|
||||||
|
pub fn read(self: @This(), alloc: std.mem.Allocator, T: type) ![]T {
|
||||||
|
const out = try alloc.alloc(T, @divExact(self.size, @sizeOf(T)));
|
||||||
|
|
||||||
|
const staging = try init(self.glloc, .{
|
||||||
|
.size = self.size,
|
||||||
|
.usage = .initMany(&.{ .MapRead, .CopyDst }),
|
||||||
|
.label = "texture_read_staging",
|
||||||
|
});
|
||||||
|
defer staging.deinit();
|
||||||
|
|
||||||
|
const enc = c.wgpuDeviceCreateCommandEncoder(self.glloc.device.device, null) orelse return error.Encoder;
|
||||||
|
const src_copy = c.WGPUTexelCopyTextureInfo{
|
||||||
|
.texture = self.raw,
|
||||||
|
.mipLevel = 0,
|
||||||
|
.origin = .{ .x = 0, .y = 0, .z = 0 },
|
||||||
|
.aspect = c.WGPUTextureAspect_All,
|
||||||
|
};
|
||||||
|
const dst_copy = c.WGPUTexelCopyBufferInfo{
|
||||||
|
.buffer = staging.raw,
|
||||||
|
.layout = .{
|
||||||
|
.offset = 0,
|
||||||
|
.bytesPerRow = self.bytesSizeRow(),
|
||||||
|
.rowsPerImage = self.def.size.height,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
c.wgpuCommandEncoderCopyTextureToBuffer(enc, &src_copy, &dst_copy, &self.def.size);
|
||||||
|
const cmd = c.wgpuCommandEncoderFinish(enc, null);
|
||||||
|
defer c.wgpuCommandEncoderRelease(enc);
|
||||||
|
defer c.wgpuCommandBufferRelease(cmd);
|
||||||
|
c.wgpuQueueSubmit(self.glloc.device.queue, 1, &cmd);
|
||||||
|
|
||||||
|
var mapped = false;
|
||||||
|
staging.mapAsync(
|
||||||
|
c.WGPUMapMode_Read,
|
||||||
|
0,
|
||||||
|
self.size,
|
||||||
|
.{ .callback = onMapped, .userdata1 = &mapped },
|
||||||
|
);
|
||||||
|
while (!mapped) self.glloc.device.poll();
|
||||||
|
|
||||||
|
const ptr: [*]const T = @ptrCast(@alignCast(
|
||||||
|
staging.getConstMappedRange(0, self.size),
|
||||||
|
));
|
||||||
|
@memcpy(out[0..out.len], ptr[0..out.len]);
|
||||||
|
staging.unmap();
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn onMapped(
|
||||||
|
status: c.WGPUMapAsyncStatus,
|
||||||
|
_: c.WGPUStringView,
|
||||||
|
userdata1: ?*anyopaque,
|
||||||
|
_: ?*anyopaque,
|
||||||
|
) callconv(.c) void {
|
||||||
|
const flag: *bool = @ptrCast(@alignCast(userdata1.?));
|
||||||
|
flag.* = (status == c.WGPUMapAsyncStatus_Success);
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
const std = @import("std");
|
||||||
|
const c = @import("utils.zig").c;
|
||||||
|
const svOpt = @import("utils.zig").svOpt;
|
||||||
|
const GpuAllocator = @import("GpuAllocator.zig");
|
||||||
|
const GpuTexture = @import("lib.zig").GpuTexture;
|
||||||
|
const GpuTextureFormat = @import("lib.zig").GpuTextureFormat;
|
||||||
|
const GpuTextureUsage = @import("lib.zig").GpuTextureUsage;
|
||||||
|
|
||||||
|
pub const GpuViewDef = struct {
|
||||||
|
label: ?[]const u8 = null,
|
||||||
|
usage: std.EnumSet(GpuTextureUsage) = .empty,
|
||||||
|
format: GpuTextureFormat = .Undefined,
|
||||||
|
};
|
||||||
|
|
||||||
|
raw: c.WGPUTextureView,
|
||||||
|
glloc: GpuAllocator,
|
||||||
|
|
||||||
|
pub fn init(glloc: GpuAllocator, texture: GpuTexture, def: GpuViewDef) !@This() {
|
||||||
|
var use: u64 = 0;
|
||||||
|
var iter = def.usage.iterator();
|
||||||
|
while (iter.next()) |flag| use |= @intFromEnum(flag);
|
||||||
|
|
||||||
|
const raw = try glloc.allocTextureView(texture.raw, .{
|
||||||
|
.label = svOpt(def.label),
|
||||||
|
.format = @intFromEnum(def.format),
|
||||||
|
.usage = use,
|
||||||
|
.mipLevelCount = 1,
|
||||||
|
.arrayLayerCount = 1,
|
||||||
|
});
|
||||||
|
return .{ .glloc = glloc, .raw = raw };
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deinit(self: @This()) void {
|
||||||
|
self.glloc.freeTextureView(self.raw);
|
||||||
|
}
|
||||||
-204
@@ -1,204 +0,0 @@
|
|||||||
const std = @import("std");
|
|
||||||
const c = @import("c.zig").c;
|
|
||||||
const GpuAllocator = @import("GpuAllocator.zig");
|
|
||||||
|
|
||||||
const Mat = @This();
|
|
||||||
|
|
||||||
buf: c.WGPUBuffer,
|
|
||||||
rows: u32,
|
|
||||||
cols: u32,
|
|
||||||
|
|
||||||
// ── Lifecycle ─────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/// Allocate GPU buffer and upload `data`. `data.len` must equal rows*cols.
|
|
||||||
pub fn load(
|
|
||||||
gloc: *GpuAllocator,
|
|
||||||
data: []const f32,
|
|
||||||
rows: u32,
|
|
||||||
cols: u32,
|
|
||||||
) !Mat {
|
|
||||||
std.debug.assert(data.len == @as(usize, rows) * cols);
|
|
||||||
const bytes = data.len * @sizeOf(f32);
|
|
||||||
const buf = try gloc.makeBuffer(
|
|
||||||
bytes,
|
|
||||||
c.WGPUBufferUsage_Storage |
|
|
||||||
c.WGPUBufferUsage_CopyDst |
|
|
||||||
c.WGPUBufferUsage_CopySrc,
|
|
||||||
);
|
|
||||||
c.wgpuQueueWriteBuffer(gloc.queue, buf, 0, data.ptr, bytes);
|
|
||||||
return .{ .buf = buf, .rows = rows, .cols = cols };
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Allocate zeroed GPU buffer (no upload).
|
|
||||||
pub fn zeros(gloc: *GpuAllocator, rows: u32, cols: u32) !Mat {
|
|
||||||
const bytes: u64 = @as(u64, rows) * cols * @sizeOf(f32);
|
|
||||||
const buf = try gloc.makeBuffer(
|
|
||||||
bytes,
|
|
||||||
c.WGPUBufferUsage_Storage |
|
|
||||||
c.WGPUBufferUsage_CopyDst |
|
|
||||||
c.WGPUBufferUsage_CopySrc,
|
|
||||||
);
|
|
||||||
return .{ .buf = buf, .rows = rows, .cols = cols };
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn deinit(self: Mat) void {
|
|
||||||
c.wgpuBufferRelease(self.buf);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn len(self: Mat) u32 {
|
|
||||||
return self.rows * self.cols;
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn byteSize(self: Mat) u64 {
|
|
||||||
return @as(u64, self.len()) * @sizeOf(f32);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Element-wise add. Shapes must match. Returns new Mat (caller owns).
|
|
||||||
pub fn add(self: Mat, gloc: *GpuAllocator, other: Mat) !Mat {
|
|
||||||
std.debug.assert(self.rows == other.rows and self.cols == other.cols);
|
|
||||||
|
|
||||||
const result = try Mat.zeros(gloc, self.rows, self.cols);
|
|
||||||
errdefer result.deinit();
|
|
||||||
|
|
||||||
const pipeline = try gloc.pipAdd();
|
|
||||||
try dispatch2in1out(gloc, pipeline, self.buf, other.buf, result.buf, self.byteSize(), self.len());
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Element-wise multiply by scalar. Returns new Mat (caller owns).
|
|
||||||
pub fn scale(self: Mat, gloc: *GpuAllocator, scalar: f32) !Mat {
|
|
||||||
const result = try Mat.zeros(gloc, self.rows, self.cols);
|
|
||||||
errdefer result.deinit();
|
|
||||||
|
|
||||||
const bytes = self.byteSize();
|
|
||||||
const n = self.len();
|
|
||||||
|
|
||||||
// Upload scalar as uniform buffer
|
|
||||||
const uni_buf = try gloc.makeBuffer(
|
|
||||||
@sizeOf(f32),
|
|
||||||
c.WGPUBufferUsage_Uniform | c.WGPUBufferUsage_CopyDst,
|
|
||||||
);
|
|
||||||
defer c.wgpuBufferRelease(uni_buf);
|
|
||||||
c.wgpuQueueWriteBuffer(gloc.queue, uni_buf, 0, &scalar, @sizeOf(f32));
|
|
||||||
|
|
||||||
const pipeline = try gloc.pipScale();
|
|
||||||
const bgl = c.wgpuComputePipelineGetBindGroupLayout(pipeline, 0);
|
|
||||||
defer c.wgpuBindGroupLayoutRelease(bgl);
|
|
||||||
|
|
||||||
const entries = [_]c.WGPUBindGroupEntry{
|
|
||||||
.{ .binding = 0, .buffer = self.buf, .offset = 0, .size = bytes },
|
|
||||||
.{ .binding = 1, .buffer = result.buf, .offset = 0, .size = bytes },
|
|
||||||
.{ .binding = 2, .buffer = uni_buf, .offset = 0, .size = @sizeOf(f32) },
|
|
||||||
};
|
|
||||||
try submitPass(gloc, pipeline, &entries, n);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Read GPU buffer back to CPU. `out.len` must be >= rows*cols.
|
|
||||||
pub fn read(self: Mat, gloc: *GpuAllocator, out: []f32) !void {
|
|
||||||
std.debug.assert(out.len >= self.len());
|
|
||||||
const bytes = self.byteSize();
|
|
||||||
|
|
||||||
const staging = try gloc.makeBuffer(
|
|
||||||
bytes,
|
|
||||||
c.WGPUBufferUsage_MapRead | c.WGPUBufferUsage_CopyDst,
|
|
||||||
);
|
|
||||||
defer c.wgpuBufferRelease(staging);
|
|
||||||
|
|
||||||
// Copy result → staging
|
|
||||||
const enc = c.wgpuDeviceCreateCommandEncoder(gloc.device, null) orelse
|
|
||||||
return error.Encoder;
|
|
||||||
c.wgpuCommandEncoderCopyBufferToBuffer(enc, self.buf, 0, staging, 0, bytes);
|
|
||||||
const cmd = c.wgpuCommandEncoderFinish(enc, null);
|
|
||||||
defer c.wgpuCommandEncoderRelease(enc);
|
|
||||||
defer c.wgpuCommandBufferRelease(cmd);
|
|
||||||
c.wgpuQueueSubmit(gloc.queue, 1, &cmd);
|
|
||||||
|
|
||||||
// Map and copy to slice
|
|
||||||
var mapped = false;
|
|
||||||
_ = c.wgpuBufferMapAsync(
|
|
||||||
staging,
|
|
||||||
c.WGPUMapMode_Read,
|
|
||||||
0,
|
|
||||||
bytes,
|
|
||||||
.{ .callback = onMapped, .userdata1 = &mapped },
|
|
||||||
);
|
|
||||||
while (!mapped) gloc.poll();
|
|
||||||
|
|
||||||
const ptr: [*]const f32 = @ptrCast(@alignCast(
|
|
||||||
c.wgpuBufferGetConstMappedRange(staging, 0, bytes),
|
|
||||||
));
|
|
||||||
@memcpy(out[0..self.len()], ptr[0..self.len()]);
|
|
||||||
c.wgpuBufferUnmap(staging);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn onMapped(
|
|
||||||
status: c.WGPUMapAsyncStatus,
|
|
||||||
_: c.WGPUStringView,
|
|
||||||
userdata1: ?*anyopaque,
|
|
||||||
_: ?*anyopaque,
|
|
||||||
) callconv(.c) void {
|
|
||||||
const flag: *bool = @ptrCast(@alignCast(userdata1.?));
|
|
||||||
flag.* = (status == c.WGPUMapAsyncStatus_Success);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Dispatch helpers ──────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/// Encode + submit a 2-input, 1-output compute pass (used by add).
|
|
||||||
fn dispatch2in1out(
|
|
||||||
gloc: *GpuAllocator,
|
|
||||||
pipeline: c.WGPUComputePipeline,
|
|
||||||
buf_a: c.WGPUBuffer,
|
|
||||||
buf_b: c.WGPUBuffer,
|
|
||||||
buf_out: c.WGPUBuffer,
|
|
||||||
bytes: u64,
|
|
||||||
n: u32,
|
|
||||||
) !void {
|
|
||||||
const bgl = c.wgpuComputePipelineGetBindGroupLayout(pipeline, 0);
|
|
||||||
defer c.wgpuBindGroupLayoutRelease(bgl);
|
|
||||||
|
|
||||||
const entries = [_]c.WGPUBindGroupEntry{
|
|
||||||
.{ .binding = 0, .buffer = buf_a, .offset = 0, .size = bytes },
|
|
||||||
.{ .binding = 1, .buffer = buf_b, .offset = 0, .size = bytes },
|
|
||||||
.{ .binding = 2, .buffer = buf_out, .offset = 0, .size = bytes },
|
|
||||||
};
|
|
||||||
try submitPass(gloc, pipeline, &entries, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Create bind group, encode pass, submit. workgroup_size=64.
|
|
||||||
fn submitPass(
|
|
||||||
gloc: *GpuAllocator,
|
|
||||||
pipeline: c.WGPUComputePipeline,
|
|
||||||
entries: []const c.WGPUBindGroupEntry,
|
|
||||||
n: u32,
|
|
||||||
) !void {
|
|
||||||
const bgl = c.wgpuComputePipelineGetBindGroupLayout(pipeline, 0);
|
|
||||||
defer c.wgpuBindGroupLayoutRelease(bgl);
|
|
||||||
|
|
||||||
const bg = c.wgpuDeviceCreateBindGroup(gloc.device, &.{
|
|
||||||
.layout = bgl,
|
|
||||||
.entries = entries.ptr,
|
|
||||||
.entryCount = entries.len,
|
|
||||||
}) orelse return error.BindGroup;
|
|
||||||
defer c.wgpuBindGroupRelease(bg);
|
|
||||||
|
|
||||||
const enc = c.wgpuDeviceCreateCommandEncoder(gloc.device, null) orelse
|
|
||||||
return error.Encoder;
|
|
||||||
const pass = c.wgpuCommandEncoderBeginComputePass(enc, null);
|
|
||||||
c.wgpuComputePassEncoderSetPipeline(pass, pipeline);
|
|
||||||
c.wgpuComputePassEncoderSetBindGroup(pass, 0, bg, 0, null);
|
|
||||||
c.wgpuComputePassEncoderDispatchWorkgroups(pass, ceilDiv(n, 64), 1, 1);
|
|
||||||
c.wgpuComputePassEncoderEnd(pass);
|
|
||||||
c.wgpuComputePassEncoderRelease(pass);
|
|
||||||
|
|
||||||
const cmd = c.wgpuCommandEncoderFinish(enc, null);
|
|
||||||
defer c.wgpuCommandEncoderRelease(enc);
|
|
||||||
defer c.wgpuCommandBufferRelease(cmd);
|
|
||||||
c.wgpuQueueSubmit(gloc.queue, 1, &cmd);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn ceilDiv(n: u32, d: u32) u32 {
|
|
||||||
return (n + d - 1) / d;
|
|
||||||
}
|
|
||||||
+186
@@ -1 +1,187 @@
|
|||||||
pub const GpuAllocator = @import("GpuAllocator.zig");
|
pub const GpuAllocator = @import("GpuAllocator.zig");
|
||||||
|
pub const GpuArenaAllocator = @import("GpuArenaAllocator.zig");
|
||||||
|
pub const GpuBuffer = @import("GpuBuffer.zig");
|
||||||
|
pub const GpuDevice = @import("GpuDevice.zig");
|
||||||
|
pub const GpuCompute = @import("GpuCompute.zig");
|
||||||
|
pub const GpuRender = @import("GpuRender.zig");
|
||||||
|
pub const GpuTexture = @import("GpuTexture.zig");
|
||||||
|
pub const GpuTextureView = @import("GpuTextureView.zig");
|
||||||
|
|
||||||
|
pub const GpuTextureFormat = enum(c_uint) {
|
||||||
|
Undefined = 0,
|
||||||
|
R8Unorm = 1,
|
||||||
|
R8Snorm = 2,
|
||||||
|
R8Uint = 3,
|
||||||
|
R8Sint = 4,
|
||||||
|
R16Unorm = 5,
|
||||||
|
R16Snorm = 6,
|
||||||
|
R16Uint = 7,
|
||||||
|
R16Sint = 8,
|
||||||
|
R16Float = 9,
|
||||||
|
RG8Unorm = 10,
|
||||||
|
RG8Snorm = 11,
|
||||||
|
RG8Uint = 12,
|
||||||
|
RG8Sint = 13,
|
||||||
|
R32Float = 14,
|
||||||
|
R32Uint = 15,
|
||||||
|
R32Sint = 16,
|
||||||
|
RG16Unorm = 17,
|
||||||
|
RG16Snorm = 18,
|
||||||
|
RG16Uint = 19,
|
||||||
|
RG16Sint = 20,
|
||||||
|
RG16Float = 21,
|
||||||
|
RGBA8Unorm = 22,
|
||||||
|
RGBA8UnormSrgb = 23,
|
||||||
|
RGBA8Snorm = 24,
|
||||||
|
RGBA8Uint = 25,
|
||||||
|
RGBA8Sint = 26,
|
||||||
|
BGRA8Unorm = 27,
|
||||||
|
BGRA8UnormSrgb = 28,
|
||||||
|
RGB10A2Uint = 29,
|
||||||
|
RGB10A2Unorm = 30,
|
||||||
|
RG11B10Ufloat = 31,
|
||||||
|
RGB9E5Ufloat = 32,
|
||||||
|
RG32Float = 33,
|
||||||
|
RG32Uint = 34,
|
||||||
|
RG32Sint = 35,
|
||||||
|
RGBA16Unorm = 36,
|
||||||
|
RGBA16Snorm = 37,
|
||||||
|
RGBA16Uint = 38,
|
||||||
|
RGBA16Sint = 39,
|
||||||
|
RGBA16Float = 40,
|
||||||
|
RGBA32Float = 41,
|
||||||
|
RGBA32Uint = 42,
|
||||||
|
RGBA32Sint = 43,
|
||||||
|
Stencil8 = 44,
|
||||||
|
Depth16Unorm = 45,
|
||||||
|
Depth24Plus = 46,
|
||||||
|
Depth24PlusStencil8 = 47,
|
||||||
|
Depth32Float = 48,
|
||||||
|
Depth32FloatStencil8 = 49,
|
||||||
|
BC1RGBAUnorm = 50,
|
||||||
|
BC1RGBAUnormSrgb = 51,
|
||||||
|
BC2RGBAUnorm = 52,
|
||||||
|
BC2RGBAUnormSrgb = 53,
|
||||||
|
BC3RGBAUnorm = 54,
|
||||||
|
BC3RGBAUnormSrgb = 55,
|
||||||
|
BC4RUnorm = 56,
|
||||||
|
BC4RSnorm = 57,
|
||||||
|
BC5RGUnorm = 58,
|
||||||
|
BC5RGSnorm = 59,
|
||||||
|
BC6HRGBUfloat = 60,
|
||||||
|
BC6HRGBFloat = 61,
|
||||||
|
BC7RGBAUnorm = 62,
|
||||||
|
BC7RGBAUnormSrgb = 63,
|
||||||
|
ETC2RGB8Unorm = 64,
|
||||||
|
ETC2RGB8UnormSrgb = 65,
|
||||||
|
ETC2RGB8A1Unorm = 66,
|
||||||
|
ETC2RGB8A1UnormSrgb = 67,
|
||||||
|
ETC2RGBA8Unorm = 68,
|
||||||
|
ETC2RGBA8UnormSrgb = 69,
|
||||||
|
EACR11Unorm = 70,
|
||||||
|
EACR11Snorm = 71,
|
||||||
|
EACRG11Unorm = 72,
|
||||||
|
EACRG11Snorm = 73,
|
||||||
|
ASTC4x4Unorm = 74,
|
||||||
|
ASTC4x4UnormSrgb = 75,
|
||||||
|
ASTC5x4Unorm = 76,
|
||||||
|
ASTC5x4UnormSrgb = 77,
|
||||||
|
ASTC5x5Unorm = 78,
|
||||||
|
ASTC5x5UnormSrgb = 79,
|
||||||
|
ASTC6x5Unorm = 80,
|
||||||
|
ASTC6x5UnormSrgb = 81,
|
||||||
|
ASTC6x6Unorm = 82,
|
||||||
|
ASTC6x6UnormSrgb = 83,
|
||||||
|
ASTC8x5Unorm = 84,
|
||||||
|
ASTC8x5UnormSrgb = 85,
|
||||||
|
ASTC8x6Unorm = 86,
|
||||||
|
ASTC8x6UnormSrgb = 87,
|
||||||
|
ASTC8x8Unorm = 88,
|
||||||
|
ASTC8x8UnormSrgb = 89,
|
||||||
|
ASTC10x5Unorm = 90,
|
||||||
|
ASTC10x5UnormSrgb = 91,
|
||||||
|
ASTC10x6Unorm = 92,
|
||||||
|
ASTC10x6UnormSrgb = 93,
|
||||||
|
ASTC10x8Unorm = 94,
|
||||||
|
ASTC10x8UnormSrgb = 95,
|
||||||
|
ASTC10x10Unorm = 96,
|
||||||
|
ASTC10x10UnormSrgb = 97,
|
||||||
|
ASTC12x10Unorm = 98,
|
||||||
|
ASTC12x10UnormSrgb = 99,
|
||||||
|
ASTC12x12Unorm = 100,
|
||||||
|
ASTC12x12UnormSrgb = 101,
|
||||||
|
Force32 = 2147483647,
|
||||||
|
|
||||||
|
pub fn bytesPerPixel(format: GpuTextureFormat) u32 {
|
||||||
|
return switch (format) {
|
||||||
|
// 8-bit formats (1 byte)
|
||||||
|
.R8Unorm, .R8Snorm, .R8Uint, .R8Sint, .Stencil8 => 1,
|
||||||
|
|
||||||
|
// 16-bit formats (2 bytes)
|
||||||
|
.R16Unorm,
|
||||||
|
.R16Snorm,
|
||||||
|
.R16Uint,
|
||||||
|
.R16Sint,
|
||||||
|
.R16Float,
|
||||||
|
.RG8Unorm,
|
||||||
|
.RG8Snorm,
|
||||||
|
.RG8Uint,
|
||||||
|
.RG8Sint,
|
||||||
|
.Depth16Unorm,
|
||||||
|
=> 2,
|
||||||
|
|
||||||
|
// 32-bit formats (4 bytes)
|
||||||
|
.R32Float,
|
||||||
|
.R32Uint,
|
||||||
|
.R32Sint,
|
||||||
|
.RG16Unorm,
|
||||||
|
.RG16Snorm,
|
||||||
|
.RG16Uint,
|
||||||
|
.RG16Sint,
|
||||||
|
.RG16Float,
|
||||||
|
.RGBA8Unorm,
|
||||||
|
.RGBA8UnormSrgb,
|
||||||
|
.RGBA8Snorm,
|
||||||
|
.RGBA8Uint,
|
||||||
|
.RGBA8Sint,
|
||||||
|
.BGRA8Unorm,
|
||||||
|
.BGRA8UnormSrgb,
|
||||||
|
.RGB10A2Uint,
|
||||||
|
.RGB10A2Unorm,
|
||||||
|
.RG11B10Ufloat,
|
||||||
|
.RGB9E5Ufloat,
|
||||||
|
.Depth24Plus,
|
||||||
|
.Depth32Float,
|
||||||
|
=> 4,
|
||||||
|
|
||||||
|
// 64-bit formats (8 bytes)
|
||||||
|
.RG32Float,
|
||||||
|
.RG32Uint,
|
||||||
|
.RG32Sint,
|
||||||
|
.RGBA16Unorm,
|
||||||
|
.RGBA16Snorm,
|
||||||
|
.RGBA16Uint,
|
||||||
|
.RGBA16Sint,
|
||||||
|
.RGBA16Float,
|
||||||
|
.Depth24PlusStencil8, // 24-bit depth + 8-bit stencil layout padded to 4+4 or 1+3
|
||||||
|
.Depth32FloatStencil8, // 32-bit float depth + 8-bit stencil (padded to 8 bytes)
|
||||||
|
=> 8,
|
||||||
|
|
||||||
|
// 128-bit formats (16 bytes)
|
||||||
|
.RGBA32Float, .RGBA32Uint, .RGBA32Sint => 16,
|
||||||
|
|
||||||
|
// Block Compressed Formats (Handled separately)
|
||||||
|
else => 0,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
pub const GpuTextureUsage = enum(u64) {
|
||||||
|
None = 0x0000000000000000,
|
||||||
|
CopySrc = 0x0000000000000001,
|
||||||
|
CopyDst = 0x0000000000000002,
|
||||||
|
TextureBinding = 0x0000000000000004,
|
||||||
|
StorageBinding = 0x0000000000000008,
|
||||||
|
RenderAttachment = 0x0000000000000010,
|
||||||
|
TransientAttachment = 0x0000000000000020,
|
||||||
|
};
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
const std = @import("std");
|
|
||||||
const GpuAllocator = @import("GpuAllocator.zig");
|
|
||||||
const Mat = @import("Mat.zig");
|
|
||||||
|
|
||||||
pub fn main() !void {
|
|
||||||
var gloc = try GpuAllocator.init();
|
|
||||||
defer gloc.deinit();
|
|
||||||
|
|
||||||
// Input data: a[i] = i, b[i] = 15 - i → add should give all 15s
|
|
||||||
var data_a: [16]f32 = undefined;
|
|
||||||
var data_b: [16]f32 = undefined;
|
|
||||||
for (0..16) |i| {
|
|
||||||
data_a[i] = @floatFromInt(i);
|
|
||||||
data_b[i] = @floatFromInt(15 - i);
|
|
||||||
}
|
|
||||||
|
|
||||||
const a = try Mat.load(&gloc, &data_a, 4, 4);
|
|
||||||
defer a.deinit();
|
|
||||||
const b = try Mat.load(&gloc, &data_b, 4, 4);
|
|
||||||
defer b.deinit();
|
|
||||||
|
|
||||||
// a + b
|
|
||||||
const sum = try a.add(&gloc, b);
|
|
||||||
defer sum.deinit();
|
|
||||||
|
|
||||||
// sum * 2
|
|
||||||
const scaled = try sum.scale(&gloc, 2.0);
|
|
||||||
defer scaled.deinit();
|
|
||||||
|
|
||||||
// Read back
|
|
||||||
var out_sum: [16]f32 = undefined;
|
|
||||||
var out_scaled: [16]f32 = undefined;
|
|
||||||
try sum.read(&gloc, &out_sum);
|
|
||||||
try scaled.read(&gloc, &out_scaled);
|
|
||||||
|
|
||||||
// Print
|
|
||||||
std.debug.print("\na + b (expect all 15):\n", .{});
|
|
||||||
printMat(&out_sum, 4, 4);
|
|
||||||
|
|
||||||
std.debug.print("\n(a + b) * 2 (expect all 30):\n", .{});
|
|
||||||
printMat(&out_scaled, 4, 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn printMat(data: []const f32, rows: u32, cols: u32) void {
|
|
||||||
for (0..rows) |r| {
|
|
||||||
for (0..cols) |col|
|
|
||||||
std.debug.print("{d:6.0}", .{data[r * cols + col]});
|
|
||||||
std.debug.print("\n", .{});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,239 +0,0 @@
|
|||||||
// Minimal WebGPU compute in Zig: element-wise matrix addition
|
|
||||||
// Uses wgpu-native C bindings.
|
|
||||||
// Build: see ../build.zig
|
|
||||||
//
|
|
||||||
// Data flow:
|
|
||||||
// CPU (mat_a, mat_b) → GPU storage buffers → compute shader → GPU buf_c
|
|
||||||
// → staging buffer (mapped) → CPU read → print
|
|
||||||
|
|
||||||
const std = @import("std");
|
|
||||||
const c = @cImport(@cInclude("wgpu.h"));
|
|
||||||
|
|
||||||
// ── Config ────────────────────────────────────────────────────────────────────
|
|
||||||
const ROWS: u32 = 4;
|
|
||||||
const COLS: u32 = 4;
|
|
||||||
const N = ROWS * COLS; // 16 elements
|
|
||||||
const BUF_BYTES = N * @sizeOf(f32);
|
|
||||||
|
|
||||||
// ── WGSL Compute Shader ───────────────────────────────────────────────────────
|
|
||||||
// workgroup_size(4,4) matches one full 4×4 matrix → dispatch(1,1,1)
|
|
||||||
const SHADER =
|
|
||||||
\\@group(0) @binding(0) var<storage, read> mat_a : array<f32>;
|
|
||||||
\\@group(0) @binding(1) var<storage, read> mat_b : array<f32>;
|
|
||||||
\\@group(0) @binding(2) var<storage, read_write> mat_c : array<f32>;
|
|
||||||
\\
|
|
||||||
\\@compute @workgroup_size(4, 4)
|
|
||||||
\\fn main(@builtin(global_invocation_id) gid : vec3<u32>) {
|
|
||||||
\\ let idx = gid.y * 4u + gid.x;
|
|
||||||
\\ if (idx < arrayLength(&mat_c)) {
|
|
||||||
\\ mat_c[idx] = mat_a[idx] + mat_b[idx];
|
|
||||||
\\ }
|
|
||||||
\\}
|
|
||||||
;
|
|
||||||
|
|
||||||
// ── Callback state ────────────────────────────────────────────────────────────
|
|
||||||
const Ctx = struct {
|
|
||||||
adapter: c.WGPUAdapter = null,
|
|
||||||
device: c.WGPUDevice = null,
|
|
||||||
};
|
|
||||||
|
|
||||||
fn onAdapter(
|
|
||||||
status: c.WGPURequestAdapterStatus,
|
|
||||||
adapter: c.WGPUAdapter,
|
|
||||||
_: c.WGPUStringView,
|
|
||||||
userdata1: ?*anyopaque,
|
|
||||||
_: ?*anyopaque,
|
|
||||||
) callconv(.c) void {
|
|
||||||
if (status != c.WGPURequestAdapterStatus_Success) {
|
|
||||||
std.log.err("Adapter request failed (status={d})", .{status});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const ctx: *Ctx = @ptrCast(@alignCast(userdata1.?));
|
|
||||||
ctx.adapter = adapter;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn onDevice(
|
|
||||||
status: c.WGPURequestDeviceStatus,
|
|
||||||
device: c.WGPUDevice,
|
|
||||||
_: c.WGPUStringView,
|
|
||||||
userdata1: ?*anyopaque,
|
|
||||||
_: ?*anyopaque,
|
|
||||||
) callconv(.c) void {
|
|
||||||
if (status != c.WGPURequestDeviceStatus_Success) {
|
|
||||||
std.log.err("Device request failed (status={d})", .{status});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const ctx: *Ctx = @ptrCast(@alignCast(userdata1.?));
|
|
||||||
ctx.device = device;
|
|
||||||
std.debug.print("{?}", .{device});
|
|
||||||
}
|
|
||||||
|
|
||||||
fn onMapped(
|
|
||||||
status: c.WGPUMapAsyncStatus,
|
|
||||||
_: c.WGPUStringView,
|
|
||||||
userdata1: ?*anyopaque,
|
|
||||||
_: ?*anyopaque,
|
|
||||||
) callconv(.c) void {
|
|
||||||
const flag: *bool = @ptrCast(@alignCast(userdata1.?));
|
|
||||||
flag.* = (status == c.WGPUMapAsyncStatus_Success);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn sv(s: []const u8) c.WGPUStringView {
|
|
||||||
return .{ .data = s.ptr, .length = s.len };
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Main ──────────────────────────────────────────────────────────────────────
|
|
||||||
pub fn main() !void {
|
|
||||||
|
|
||||||
// 1. Instance ──────────────────────────────────────────────────────────────
|
|
||||||
const instance = c.wgpuCreateInstance(&std.mem.zeroes(c.WGPUInstanceDescriptor)) orelse
|
|
||||||
return error.NoInstance;
|
|
||||||
defer c.wgpuInstanceRelease(instance);
|
|
||||||
|
|
||||||
// 2. Adapter (async → poll) ────────────────────────────────────────────────
|
|
||||||
var ctx = Ctx{};
|
|
||||||
_ = c.wgpuInstanceRequestAdapter(
|
|
||||||
instance,
|
|
||||||
&.{ .powerPreference = c.WGPUPowerPreference_HighPerformance },
|
|
||||||
.{ .callback = onAdapter, .userdata1 = &ctx },
|
|
||||||
);
|
|
||||||
c.wgpuInstanceProcessEvents(instance); // drive callbacks
|
|
||||||
const adapter = ctx.adapter orelse return error.NoAdapter;
|
|
||||||
defer c.wgpuAdapterRelease(adapter);
|
|
||||||
|
|
||||||
// 3. Device ────────────────────────────────────────────────────────────────
|
|
||||||
_ = c.wgpuAdapterRequestDevice(adapter, null, .{ .callback = onDevice, .userdata1 = &ctx });
|
|
||||||
c.wgpuInstanceProcessEvents(instance);
|
|
||||||
const device = ctx.device orelse return error.NoDevice;
|
|
||||||
defer c.wgpuDeviceRelease(device);
|
|
||||||
|
|
||||||
const queue = c.wgpuDeviceGetQueue(device);
|
|
||||||
defer c.wgpuQueueRelease(queue);
|
|
||||||
|
|
||||||
// 4. Input data ────────────────────────────────────────────────────────────
|
|
||||||
// mat_a[i] = i (0 … 15)
|
|
||||||
// mat_b[i] = 15 − i → every element of mat_c should equal 15
|
|
||||||
var mat_a: [N]f32 = undefined;
|
|
||||||
var mat_b: [N]f32 = undefined;
|
|
||||||
for (0..N) |i| {
|
|
||||||
mat_a[i] = @floatFromInt(i);
|
|
||||||
mat_b[i] = @floatFromInt(N - 1 - i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 5. GPU Buffers ───────────────────────────────────────────────────────────
|
|
||||||
const buf_a = c.wgpuDeviceCreateBuffer(device, &.{
|
|
||||||
.usage = c.WGPUBufferUsage_Storage | c.WGPUBufferUsage_CopyDst,
|
|
||||||
.size = BUF_BYTES,
|
|
||||||
}) orelse return error.BufferA;
|
|
||||||
|
|
||||||
const buf_b = c.wgpuDeviceCreateBuffer(device, &.{
|
|
||||||
.usage = c.WGPUBufferUsage_Storage | c.WGPUBufferUsage_CopyDst,
|
|
||||||
.size = BUF_BYTES,
|
|
||||||
}) orelse return error.BufferB;
|
|
||||||
|
|
||||||
// buf_c: GPU-only result; staging: CPU-readable copy
|
|
||||||
const buf_c = c.wgpuDeviceCreateBuffer(device, &.{
|
|
||||||
.usage = c.WGPUBufferUsage_Storage | c.WGPUBufferUsage_CopySrc,
|
|
||||||
.size = BUF_BYTES,
|
|
||||||
}) orelse return error.BufferC;
|
|
||||||
|
|
||||||
const buf_staging = c.wgpuDeviceCreateBuffer(device, &.{
|
|
||||||
.usage = c.WGPUBufferUsage_MapRead | c.WGPUBufferUsage_CopyDst,
|
|
||||||
.size = BUF_BYTES,
|
|
||||||
}) orelse return error.BufferStaging;
|
|
||||||
|
|
||||||
defer c.wgpuBufferRelease(buf_a);
|
|
||||||
defer c.wgpuBufferRelease(buf_b);
|
|
||||||
defer c.wgpuBufferRelease(buf_c);
|
|
||||||
defer c.wgpuBufferRelease(buf_staging);
|
|
||||||
|
|
||||||
// Upload inputs
|
|
||||||
c.wgpuQueueWriteBuffer(queue, buf_a, 0, &mat_a, BUF_BYTES);
|
|
||||||
c.wgpuQueueWriteBuffer(queue, buf_b, 0, &mat_b, BUF_BYTES);
|
|
||||||
|
|
||||||
// 6. Shader module ─────────────────────────────────────────────────────────
|
|
||||||
// ✅ New API (0.20+)
|
|
||||||
var wgsl_src = c.WGPUShaderSourceWGSL{
|
|
||||||
.chain = .{ .sType = c.WGPUSType_ShaderSourceWGSL },
|
|
||||||
.code = sv(SHADER),
|
|
||||||
};
|
|
||||||
const shader = c.wgpuDeviceCreateShaderModule(device, &.{
|
|
||||||
.nextInChain = @ptrCast(&wgsl_src),
|
|
||||||
}) orelse return error.Shader;
|
|
||||||
|
|
||||||
// 7. Compute pipeline (layout auto-inferred from shader) ───────────────────
|
|
||||||
// ✅
|
|
||||||
const pipeline = c.wgpuDeviceCreateComputePipeline(device, &.{
|
|
||||||
.compute = .{
|
|
||||||
.module = shader,
|
|
||||||
.entryPoint = sv("main"),
|
|
||||||
},
|
|
||||||
}) orelse return error.Pipeline;
|
|
||||||
defer c.wgpuComputePipelineRelease(pipeline);
|
|
||||||
|
|
||||||
// 8. Bind group ────────────────────────────────────────────────────────────
|
|
||||||
const bgl = c.wgpuComputePipelineGetBindGroupLayout(pipeline, 0);
|
|
||||||
defer c.wgpuBindGroupLayoutRelease(bgl);
|
|
||||||
|
|
||||||
const entries = [_]c.WGPUBindGroupEntry{
|
|
||||||
.{ .binding = 0, .buffer = buf_a, .offset = 0, .size = BUF_BYTES },
|
|
||||||
.{ .binding = 1, .buffer = buf_b, .offset = 0, .size = BUF_BYTES },
|
|
||||||
.{ .binding = 2, .buffer = buf_c, .offset = 0, .size = BUF_BYTES },
|
|
||||||
};
|
|
||||||
const bind_group = c.wgpuDeviceCreateBindGroup(device, &.{
|
|
||||||
.layout = bgl,
|
|
||||||
.entries = &entries,
|
|
||||||
.entryCount = entries.len,
|
|
||||||
}) orelse return error.BindGroup;
|
|
||||||
defer c.wgpuBindGroupRelease(bind_group);
|
|
||||||
|
|
||||||
// 9. Encode compute pass + buffer copy ────────────────────────────────────
|
|
||||||
const encoder = c.wgpuDeviceCreateCommandEncoder(device, null) orelse
|
|
||||||
return error.Encoder;
|
|
||||||
|
|
||||||
const pass = c.wgpuCommandEncoderBeginComputePass(encoder, null);
|
|
||||||
c.wgpuComputePassEncoderSetPipeline(pass, pipeline);
|
|
||||||
c.wgpuComputePassEncoderSetBindGroup(pass, 0, bind_group, 0, null);
|
|
||||||
// dispatch(1,1,1): one workgroup of size (4,4) covers the whole 4×4 matrix
|
|
||||||
c.wgpuComputePassEncoderDispatchWorkgroups(pass, 1, 1, 1);
|
|
||||||
c.wgpuComputePassEncoderEnd(pass);
|
|
||||||
c.wgpuComputePassEncoderRelease(pass);
|
|
||||||
|
|
||||||
// Copy result buffer → CPU-readable staging buffer
|
|
||||||
c.wgpuCommandEncoderCopyBufferToBuffer(encoder, buf_c, 0, buf_staging, 0, BUF_BYTES);
|
|
||||||
|
|
||||||
const cmdbuf = c.wgpuCommandEncoderFinish(encoder, null);
|
|
||||||
defer c.wgpuCommandEncoderRelease(encoder);
|
|
||||||
defer c.wgpuCommandBufferRelease(cmdbuf);
|
|
||||||
|
|
||||||
// 10. Submit ───────────────────────────────────────────────────────────────
|
|
||||||
c.wgpuQueueSubmit(queue, 1, &cmdbuf);
|
|
||||||
|
|
||||||
// 11. Map staging buffer back to CPU ──────────────────────────────────────
|
|
||||||
var mapped = false;
|
|
||||||
_ = c.wgpuBufferMapAsync(
|
|
||||||
buf_staging,
|
|
||||||
c.WGPUMapMode_Read,
|
|
||||||
0,
|
|
||||||
BUF_BYTES,
|
|
||||||
.{ .callback = onMapped, .userdata1 = &mapped },
|
|
||||||
);
|
|
||||||
// Poll the device until the async map completes
|
|
||||||
while (!mapped) _ = c.wgpuDevicePoll(device, 1, null);
|
|
||||||
|
|
||||||
const ptr: [*]const f32 = @ptrCast(@alignCast(
|
|
||||||
c.wgpuBufferGetConstMappedRange(buf_staging, 0, BUF_BYTES),
|
|
||||||
));
|
|
||||||
const result = ptr[0..N];
|
|
||||||
|
|
||||||
// 12. Print ────────────────────────────────────────────────────────────────
|
|
||||||
std.debug.print("\nmat_a + mat_b ({d}×{d}):\n", .{ ROWS, COLS });
|
|
||||||
for (0..ROWS) |r| {
|
|
||||||
for (0..COLS) |col|
|
|
||||||
std.debug.print("{d:6.0}", .{result[r * COLS + col]});
|
|
||||||
std.debug.print("\n", .{});
|
|
||||||
}
|
|
||||||
// Expected output: every cell = 15.0
|
|
||||||
|
|
||||||
c.wgpuBufferUnmap(buf_staging);
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
pub const SHADER_ADD =
|
|
||||||
\\@group(0) @binding(0) var<storage, read> a : array<f32>;
|
|
||||||
\\@group(0) @binding(1) var<storage, read> b : array<f32>;
|
|
||||||
\\@group(0) @binding(2) var<storage, read_write> out : array<f32>;
|
|
||||||
\\
|
|
||||||
\\@compute @workgroup_size(64)
|
|
||||||
\\fn main(@builtin(global_invocation_id) gid : vec3<u32>) {
|
|
||||||
\\ let i = gid.x;
|
|
||||||
\\ if (i < arrayLength(&out)) {
|
|
||||||
\\ out[i] = a[i] + b[i];
|
|
||||||
\\ }
|
|
||||||
\\}
|
|
||||||
;
|
|
||||||
|
|
||||||
pub const SHADER_SCALE =
|
|
||||||
\\struct Uniforms { scalar : f32 }
|
|
||||||
\\@group(0) @binding(0) var<storage, read> a : array<f32>;
|
|
||||||
\\@group(0) @binding(1) var<storage, read_write> out : array<f32>;
|
|
||||||
\\@group(0) @binding(2) var<uniform> u : Uniforms;
|
|
||||||
\\
|
|
||||||
\\@compute @workgroup_size(64)
|
|
||||||
\\fn main(@builtin(global_invocation_id) gid : vec3<u32>) {
|
|
||||||
\\ let i = gid.x;
|
|
||||||
\\ if (i < arrayLength(&out)) {
|
|
||||||
\\ out[i] = a[i] * u.scalar;
|
|
||||||
\\ }
|
|
||||||
\\}
|
|
||||||
;
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
pub const c = @cImport(@cInclude("wgpu.h"));
|
||||||
|
|
||||||
|
pub fn sv(s: []const u8) c.WGPUStringView {
|
||||||
|
return .{ .data = s.ptr, .length = s.len };
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Allows safely passing an optional Zig string to a WebGPU string view.
|
||||||
|
pub fn svOpt(s: ?[]const u8) c.WGPUStringView {
|
||||||
|
if (s) |str| return sv(str);
|
||||||
|
return .{ .data = null, .length = 0 };
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Helper to print a WGPUStringView in your logs.
|
||||||
|
pub fn viewStr(view: c.WGPUStringView) []const u8 {
|
||||||
|
if (view.data != null and view.length > 0) {
|
||||||
|
return view.data[0..view.length];
|
||||||
|
}
|
||||||
|
return "unnamed";
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user