kbz_8/SPIRV-Interpreter
1
0
Fork 0
Code Issues 1 Pull Requests actions.actions Packages Projects Releases Wiki Activity

yes
All checks were successful
Build / build (push) Successful in 5m39s
Details
Test / build (push) Successful in 11m34s
Details

Browse Source
This commit is contained in:
kbz_8
2026-04-04 03:58:39 +02:00
parent 15eb36ea4d
commit a83a761afa
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Value.zig
View File

@@ -148,8 +148,8 @@ pub const Value = union(Type) {
.value = .{ .float64 = 0 }, .value = .{ .float64 = 0 },
} }, } },
.Vector => |v| blk: { .Vector => |v| blk: {
var self: Self = .{ .Vector = allocator.alloc(Self, member_count) catch return RuntimeError.OutOfMemory }; const self: Self = .{ .Vector = allocator.alloc(Self, member_count) catch return RuntimeError.OutOfMemory };
errdefer self.deinit(allocator); errdefer allocator.free(self.Vector);
for (self.Vector) |*value| { for (self.Vector) |*value| {
value.* = try Self.init(allocator, results, v.components_type_word, is_externally_visible); value.* = try Self.init(allocator, results, v.components_type_word, is_externally_visible);
@@ -166,8 +166,8 @@ pub const Value = union(Type) {
.Vector3u32 => .{ .Vector3u32 = Vec3u32{ 0, 0, 0 } }, .Vector3u32 => .{ .Vector3u32 = Vec3u32{ 0, 0, 0 } },
.Vector2u32 => .{ .Vector2u32 = Vec2u32{ 0, 0 } }, .Vector2u32 => .{ .Vector2u32 = Vec2u32{ 0, 0 } },
.Matrix => |m| blk: { .Matrix => |m| blk: {
var self: Self = .{ .Matrix = allocator.alloc(Self, member_count) catch return RuntimeError.OutOfMemory }; const self: Self = .{ .Matrix = allocator.alloc(Self, member_count) catch return RuntimeError.OutOfMemory };
errdefer self.deinit(allocator); errdefer allocator.free(self.Matrix);
for (self.Matrix) |*value| { for (self.Matrix) |*value| {
value.* = try Self.init(allocator, results, m.column_type_word, is_externally_visible); value.* = try Self.init(allocator, results, m.column_type_word, is_externally_visible);
@@ -186,13 +186,13 @@ pub const Value = union(Type) {
}; };
} }
var self: Self = .{ const self: Self = .{
.Array = .{ .Array = .{
.stride = a.stride, .stride = a.stride,
.values = allocator.alloc(Self, member_count) catch return RuntimeError.OutOfMemory, .values = allocator.alloc(Self, member_count) catch return RuntimeError.OutOfMemory,
}, },
}; };
errdefer self.deinit(allocator); errdefer allocator.free(self.Array.values);
for (self.Array.values) |*value| { for (self.Array.values) |*value| {
value.* = try Self.init(allocator, results, a.components_type_word, is_externally_visible); value.* = try Self.init(allocator, results, a.components_type_word, is_externally_visible);
@@ -200,13 +200,13 @@ pub const Value = union(Type) {
break :blk self; break :blk self;
}, },
.Structure => |s| blk: { .Structure => |s| blk: {
var self: Self = .{ const self: Self = .{
.Structure = .{ .Structure = .{
.offsets = allocator.dupe(?SpvWord, s.members_offsets) catch return RuntimeError.OutOfMemory, .offsets = allocator.dupe(?SpvWord, s.members_offsets) catch return RuntimeError.OutOfMemory,
.values = allocator.alloc(Self, member_count) catch return RuntimeError.OutOfMemory, .values = allocator.alloc(Self, member_count) catch return RuntimeError.OutOfMemory,
}, },
}; };
errdefer self.deinit(allocator); errdefer allocator.free(self.Structure.values);
for (self.Structure.values, s.members_type_word) |*value, type_word| { for (self.Structure.values, s.members_type_word) |*value, type_word| {
value.* = try Self.init(allocator, results, type_word, is_externally_visible); value.* = try Self.init(allocator, results, type_word, is_externally_visible);
@@ -235,6 +235,7 @@ pub const Value = union(Type) {
.Vector => |v| .{ .Vector => |v| .{
.Vector = blk: { .Vector = blk: {
const values = allocator.dupe(Self, v) catch return RuntimeError.OutOfMemory; const values = allocator.dupe(Self, v) catch return RuntimeError.OutOfMemory;
errdefer allocator.free(values);
for (values, v) |*new_value, value| new_value.* = try value.dupe(allocator); for (values, v) |*new_value, value| new_value.* = try value.dupe(allocator);
break :blk values; break :blk values;
}, },
@@ -242,13 +243,15 @@ pub const Value = union(Type) {
.Matrix => |m| .{ .Matrix => |m| .{
.Matrix = blk: { .Matrix = blk: {
const values = allocator.dupe(Self, m) catch return RuntimeError.OutOfMemory; const values = allocator.dupe(Self, m) catch return RuntimeError.OutOfMemory;
errdefer allocator.free(values);
for (values, m) |*new_value, value| new_value.* = try value.dupe(allocator); for (values, m) |*new_value, value| new_value.* = try value.dupe(allocator);
break :blk values; break :blk values;
}, },
}, },
.Array => |a| .{ .Array => |*a| .{
.Array = blk: { .Array = blk: {
const values = allocator.dupe(Self, a.values) catch return RuntimeError.OutOfMemory; const values = allocator.dupe(Self, a.values) catch return RuntimeError.OutOfMemory;
errdefer allocator.free(values);
for (values, a.values) |*new_value, value| new_value.* = try value.dupe(allocator); for (values, a.values) |*new_value, value| new_value.* = try value.dupe(allocator);
break :blk .{ break :blk .{
.stride = a.stride, .stride = a.stride,
@@ -256,9 +259,10 @@ pub const Value = union(Type) {
}; };
}, },
}, },
.Structure => |s| .{ .Structure => |*s| .{
.Structure = blk: { .Structure = blk: {
const values = allocator.dupe(Self, s.values) catch return RuntimeError.OutOfMemory; const values = allocator.dupe(Self, s.values) catch return RuntimeError.OutOfMemory;
errdefer allocator.free(values);
for (values, s.values) |*new_value, value| new_value.* = try value.dupe(allocator); for (values, s.values) |*new_value, value| new_value.* = try value.dupe(allocator);
break :blk .{ break :blk .{
.offsets = allocator.dupe(?SpvWord, s.offsets) catch return RuntimeError.OutOfMemory, .offsets = allocator.dupe(?SpvWord, s.offsets) catch return RuntimeError.OutOfMemory,
@@ -619,15 +623,15 @@ pub const Value = union(Type) {
pub fn deinit(self: *Self, allocator: std.mem.Allocator) void { pub fn deinit(self: *Self, allocator: std.mem.Allocator) void {
switch (self.*) { switch (self.*) {
.Vector, .Matrix => |values| { .Vector, .Matrix => |*values| {
for (values) |*value| value.deinit(allocator); for (values.*) |*value| value.deinit(allocator);
allocator.free(values); allocator.free(values.*);
}, },
.Array => |arr| { .Array => |*arr| {
for (arr.values) |*value| value.deinit(allocator); for (arr.values) |*value| value.deinit(allocator);
allocator.free(arr.values); allocator.free(arr.values);
}, },
.Structure => |s| { .Structure => |*s| {
for (s.values) |*value| value.deinit(allocator); for (s.values) |*value| value.deinit(allocator);
allocator.free(s.values); allocator.free(s.values);
allocator.free(s.offsets); allocator.free(s.offsets);

10
src/opcodes.zig
View File

@@ -883,14 +883,20 @@ fn ConversionEngine(comptime from_kind: PrimitiveType, comptime to_kind: Primiti
fn MathEngine(comptime T: PrimitiveType, comptime Op: MathOp, comptime IsAtomic: bool) type { fn MathEngine(comptime T: PrimitiveType, comptime Op: MathOp, comptime IsAtomic: bool) type {
return struct { return struct {
fn op(_: std.mem.Allocator, _: SpvWord, rt: *Runtime) RuntimeError!void { fn op(allocator: std.mem.Allocator, _: SpvWord, rt: *Runtime) RuntimeError!void {
const target_type = (try rt.results[try rt.it.next()].getVariant()).Type; const target_type = (try rt.results[try rt.it.next()].getVariant()).Type;
const dst = try rt.results[try rt.it.next()].getValue(); const dst = try rt.results[try rt.it.next()].getValue();
const lhs = try rt.results[try rt.it.next()].getValue(); const lhs = try rt.results[try rt.it.next()].getValue();
var arena = std.heap.ArenaAllocator.init(allocator);
defer arena.deinit();
var lhs_save: ?Value = null;
if (comptime IsAtomic) { if (comptime IsAtomic) {
_ = rt.it.skip(); // scope _ = rt.it.skip(); // scope
_ = rt.it.skip(); // semantic _ = rt.it.skip(); // semantic
lhs_save = try lhs.dupe(arena.allocator());
} }
const rhs = try rt.results[try rt.it.next()].getValue(); const rhs = try rt.results[try rt.it.next()].getValue();
@@ -989,6 +995,8 @@ fn MathEngine(comptime T: PrimitiveType, comptime Op: MathOp, comptime IsAtomic:
if (comptime IsAtomic) { if (comptime IsAtomic) {
try copyValue(lhs, dst); try copyValue(lhs, dst);
try copyValue(dst, &lhs_save.?);
try lhs.flushPtr(allocator);
} }
} }