Commit 7c6923136718aab50fc20a327e47c0c23517dda2 | zig

author	Robin Voetter <robin@voetter.nl> 2024-10-20 16:59:32+02:00
committer	Robin Voetter <robin@voetter.nl> 2024-10-27 15:19:56+01:00
log	7c6923136718aab50fc20a327e47c0c23517dda2
tree	16bd1698bd9e8c6a3723e299331af4a97bac68bb
parent	6de456c179d81b9118ecd26eb9d7c90213bac313
signature	Signed by SSH key SHA256:ZS52FNyUv2WUXvO4njmVaFVO46RHojFuOrxRc4LuKzg

spirv: use PhysicalStorageBuffer64 for global pointers under vk

We can use real pointers with this storage class!!

2 files changed, 28 insertions(+), 11 deletions(-)

src
- codegen
  - spirv.zig
- link
  - SpirV.zig

src/codegen/spirv.zig+7-2

 @@ -1843,11 +1843,16 @@ const NavGen = struct {
         return switch (as) {
             .generic => switch (target.os.tag) {
                 .vulkan => .Private,
-                else => .Generic,
+                .opencl => .Generic,
+                else => unreachable,
             },
             .shared => .Workgroup,
             .local => .Private,
-            .global => .CrossWorkgroup,
+            .global => switch (target.os.tag) {
+                .opencl => .CrossWorkgroup,
+                .vulkan => .PhysicalStorageBuffer,
+                else => unreachable,
+            },
             .constant => .UniformConstant,
             .input => .Input,
             .output => .Output,

src/link/SpirV.zig+21-9

 @@ -296,9 +296,8 @@ fn writeCapabilities(spv: *SpvModule, target: std.Target) !void {
     // TODO: Integrate with a hypothetical feature system
     const caps: []const spec.Capability = switch (target.os.tag) {
         .opencl => &.{ .Kernel, .Addresses, .Int8, .Int16, .Int64, .Float64, .Float16, .Vector16, .GenericPointer },
-        .opengl => &.{.Shader},
+        .vulkan => &.{ .Shader, .PhysicalStorageBufferAddresses, .StoragePushConstant16, .Int8, .Int16, .Int64, .Float64, .Float16 },
-        .vulkan => &.{ .Shader, .VariablePointersStorageBuffer, .Int8, .Int16, .Int64, .Float64, .Float16 },
+        else => unreachable,
-        else => unreachable, // TODO
     };
     for (caps) |cap| {
 @@ -306,19 +305,32 @@ fn writeCapabilities(spv: *SpvModule, target: std.Target) !void {
             .capability = cap,
         });
     }
+    switch (target.os.tag) {
+        .vulkan => {
+            try spv.sections.extensions.emit(gpa, .OpExtension, .{
+                .name = "SPV_KHR_physical_storage_buffer",
+            });
+        },
+        else => {},
+    }
 }
 fn writeMemoryModel(spv: *SpvModule, target: std.Target) !void {
     const gpa = spv.gpa;
-    const addressing_model = switch (target.os.tag) {
+    const addressing_model: spec.AddressingModel = switch (target.os.tag) {
         .opencl => switch (target.cpu.arch) {
-            .spirv32 => spec.AddressingModel.Physical32,
+            .spirv32 => .Physical32,
-            .spirv64 => spec.AddressingModel.Physical64,
+            .spirv64 => .Physical64,
-            else => unreachable, // TODO
+            else => unreachable,
+        },
+        .opengl, .vulkan => switch (target.cpu.arch) {
+            .spirv32 => .Logical, // TODO: I don't think this will ever be implemented.
+            .spirv64 => .PhysicalStorageBuffer64,
+            else => unreachable,
         },
-        .opengl, .vulkan => spec.AddressingModel.Logical,
+        else => unreachable,
-        else => unreachable, // TODO
     };
     const memory_model: spec.MemoryModel = switch (target.os.tag) {