spirv: id range helper

This allows us to more sanely allocate a continuous
range of result-ids, and avoids a bunch of nasty
casting code in a few places. Its currently not used
very often, but will be useful in the future.

1 files changed, 18 insertions, 6 deletions

diff --git a/src/codegen/spirv/Module.zig b/src/codegen/spirv/Module.zig
index 92b400d438..2d3a79ffc9 100644
--- a/src/codegen/spirv/Module.zig
+++ b/src/codegen/spirv/Module.zig
@@ -197,14 +197,26 @@ pub fn deinit(self: *Module) void {
     self.* = undefined;
 }
 
-pub fn allocId(self: *Module) spec.IdResult {
-    defer self.next_result_id += 1;
-    return @enumFromInt(self.next_result_id);
-}
+pub const IdRange = struct {
+    base: u32,
+    len: u32,
+
+    pub fn at(range: IdRange, i: usize) IdResult {
+        assert(i < range.len);
+        return @enumFromInt(range.base + i);
+    }
+};
 
-pub fn allocIds(self: *Module, n: u32) spec.IdResult {
+pub fn allocIds(self: *Module, n: u32) IdRange {
     defer self.next_result_id += n;
-    return @enumFromInt(self.next_result_id);
+    return .{
+        .base = self.next_result_id,
+        .len = n,
+    };
+}
+
+pub fn allocId(self: *Module) IdResult {
+    return self.allocIds(1).at(0);
 }
 
 pub fn idBound(self: Module) Word {