summaryrefslogtreecommitdiff
path: root/examples/spheres
diff options
context:
space:
mode:
Diffstat (limited to 'examples/spheres')
-rw-r--r--examples/spheres/README.md10
-rw-r--r--examples/spheres/src/main.zig31
-rw-r--r--examples/spheres/test/play.script2
3 files changed, 17 insertions, 26 deletions
diff --git a/examples/spheres/README.md b/examples/spheres/README.md
index 3c65666..30023de 100644
--- a/examples/spheres/README.md
+++ b/examples/spheres/README.md
@@ -17,10 +17,12 @@ Everything moves on the GPU:
| `sprite.*`, `trail.*`, `fade.frag` | The sky: the cloud as layered dust on a long exposure, system 0's bodies as glows, and their trails as ribbons tapering with age. |
| `link.*` | The coupling: a ribbon from modulator to carrier, as bright as the coupling, with pulses flowing along it. |
-The sound reaches the speakers by a readback (`f.download`) about two
-frames later; the CPU only queues it, and hands it to sketchbook's `scope`
-module (the views micscope uses) for the oscilloscope, spectrum and
-spectrogram.
+The sound goes from the GPU's block straight to the speakers
+(`f.audioBuffer`): the host reads it back in the same frame and keeps the
+lead it measures queued (`in.lead`), so a change is heard in about two
+device pulls rather than 100 ms. A second readback (`f.download`), a frame
+later, hands it to sketchbook's `scope` module (the views micscope uses)
+for the oscilloscope, spectrum and spectrogram.
## From motion to sound
diff --git a/examples/spheres/src/main.zig b/examples/spheres/src/main.zig
index 60b498f..062aebd 100644
--- a/examples/spheres/src/main.zig
+++ b/examples/spheres/src/main.zig
@@ -27,8 +27,6 @@ pub const height = 800;
/// The audio stream's key.
const stream = 1;
-/// How much sound is kept queued ahead: synthesised, read back, queued.
-const lead_seconds = 0.1;
/// Systems integrated: system 0 and its cloud.
const systems = layouts.max_systems;
/// How far apart the copies start.
@@ -87,8 +85,6 @@ const Travel = struct { to: chords.Pick, speed: f64 };
pub const Session = struct {
reset: sk.Handled = .{},
started: bool = false,
- /// Synthesised samples not back from the GPU yet.
- in_flight: usize = 0,
/// System 0 as last read back, and whether it has been.
lead: layouts.Lead = std.mem.zeroes(layouts.Lead),
have_lead: bool = false,
@@ -113,8 +109,6 @@ pub const Session = struct {
travel: ?Travel = null,
/// The snapshot whose chord is held.
held: ?chords.Pick = null,
- /// Samples still to come back from before a chord was chosen, dropped.
- discard: usize = 0,
gpu: Gpu = .{},
};
@@ -418,18 +412,13 @@ pub fn draw(s: *const State, ss: *Session, f: *sk.Frame) void {
const g = &ss.gpu;
setup(g, f);
- // What came back: sound for the speakers and the scope, and system 0.
+ // What came back: the sound, for the scope, and system 0.
for (in.downloads) |d| switch (@as(Readback, @enumFromInt(d.key))) {
.audio => {
const samples = std.mem.bytesAsSlice(f32, d.bytes[0 .. d.bytes.len / 4 * 4]);
const aligned = f.scratch.alloc(f32, samples.len) catch continue;
for (aligned, samples) |*to, from| to.* = from;
- ss.in_flight -|= aligned.len;
- // Sound made before a chord was chosen is not played.
- const dropped = @min(ss.discard, aligned.len);
- ss.discard -= dropped;
- f.audio(stream, aligned[dropped..], .{});
- ss.scope.push(aligned[dropped..]);
+ ss.scope.push(aligned);
},
.lead => if (d.bytes.len >= @sizeOf(layouts.Lead)) {
ss.lead = std.mem.bytesToValue(layouts.Lead, d.bytes[0..@sizeOf(layouts.Lead)]);
@@ -456,7 +445,6 @@ pub fn draw(s: *const State, ss: *Session, f: *sk.Frame) void {
ss.held = pick;
ss.travel = .{ .to = pick, .speed = @max(@abs(pick.time() - ss.time) / 1.2, 2) };
f.audio(stream, &.{}, .{ .clear = true });
- ss.discard = ss.in_flight;
}
};
@@ -517,13 +505,12 @@ pub fn draw(s: *const State, ss: *Session, f: *sk.Frame) void {
ss.trail_filled = @min(ss.trail_filled + trail.points, layouts.trail);
f.download(g.lead, .{ .size = @sizeOf(layouts.Lead), .key = @intFromEnum(Readback.lead) });
- // The sound: enough to keep `lead_seconds` queued, counting what is
- // still on its way back from the GPU.
- const queued = in.stream(stream).queued + ss.in_flight;
- const want: usize = @min(@as(usize, @intFromFloat(lead_seconds * rate)) -| queued, layouts.max_block);
+ // The sound: as much as keeps the host's lead queued, streamed straight
+ // from the GPU's block; and read back for the scope.
+ const want: u32 = @min(in.lead -| in.stream(stream).queued, layouts.max_block);
if (want > 0) {
const params = gpu.uniform(f.scratch, layouts.SynthParams{
- .count = @intCast(want),
+ .count = want,
.mode = @intFromEnum(s.mode),
.rate = @floatCast(rate),
// Loud enough for a phone's speaker; tanh rounds the peaks off.
@@ -535,11 +522,11 @@ pub fn draw(s: *const State, ss: *Session, f: *sk.Frame) void {
.readonly = &.{ g.voices, g.phases },
.readwrite = &.{g.block},
.uniforms = params,
- .groups = .{ @intCast((want + 63) / 64), 1, 1 },
+ .groups = .{ (want + 63) / 64, 1, 1 },
});
f.compute(.{ .label = "advance.comp", .kernel = advance_kernel, .readwrite = &.{ g.voices, g.phases }, .uniforms = params });
- f.download(g.block, .{ .size = @intCast(want * @sizeOf(f32)), .key = @intFromEnum(Readback.audio) });
- ss.in_flight += want;
+ f.audioBuffer(stream, g.block, .{ .count = want });
+ f.download(g.block, .{ .size = want * @sizeOf(f32), .key = @intFromEnum(Readback.audio) });
}
const l = Layout.of(in.width, in.height, s.instrument);
diff --git a/examples/spheres/test/play.script b/examples/spheres/test/play.script
index 1b06372..8dbe978 100644
--- a/examples/spheres/test/play.script
+++ b/examples/spheres/test/play.script
@@ -1,6 +1,8 @@
# Plays each preset and synthesis mode headless; screenshots land in
# .zig-cache/spheres/ for review.
frames 120
+# The GPU's blocks reach the speakers' stream.
+expect-audio 1
expect running true
expect preset figure_eight
screenshot .zig-cache/spheres/figure-eight.png