diff --git a/build.zig.zon b/build.zig.zon index d7656b7..59ff302 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -32,8 +32,8 @@ // Soft dependencies .SPIRV_Interpreter = .{ - .url = "git+https://github.com/Kbz-8/SPIRV-Interpreter#4a8b24d67659ad6c70b655c3f65fbe0b9727451e", - .hash = "SPIRV_Interpreter-0.0.1-ajmpnwKACQBTadk3BJ7tNsz-vQv_07pwuffX4iXOOX8I", + .url = "git+https://github.com/Kbz-8/SPIRV-Interpreter#58cf66b6c9797a3b8f1d47ac2437850738faf83b", + .hash = "SPIRV_Interpreter-0.0.1-ajmpn9OKCQAK8P9M3hN6IuUqy08O8hlqAVowAzC0YWCR", .lazy = true, }, //.SPIRV_Interpreter = .{ diff --git a/src/software/SoftDescriptorSet.zig b/src/software/SoftDescriptorSet.zig index 302a249..a07b8d9 100644 --- a/src/software/SoftDescriptorSet.zig +++ b/src/software/SoftDescriptorSet.zig @@ -298,7 +298,15 @@ fn copyDescriptorRange(dst_desc: *Descriptor, dst_array_element: usize, src_desc return true; } -fn copyDescriptorRangePreservingImmutableSamplers(self: *Self, dst_binding: usize, dst_desc: *Descriptor, dst_array_element: usize, src_desc: Descriptor, src_array_element: usize, descriptor_count: usize) bool { +fn copyDescriptorRangePreservingImmutableSamplers( + self: *Self, + dst_binding: usize, + dst_desc: *Descriptor, + dst_array_element: usize, + src_desc: Descriptor, + src_array_element: usize, + descriptor_count: usize, +) bool { const immutable_samplers = self.interface.layout.bindings[dst_binding].immutable_samplers; if (immutable_samplers.len == 0) { return copyDescriptorRange(dst_desc, dst_array_element, src_desc, src_array_element, descriptor_count); diff --git a/src/software/SoftSampler.zig b/src/software/SoftSampler.zig index 282cd3b..c694000 100644 --- a/src/software/SoftSampler.zig +++ b/src/software/SoftSampler.zig @@ -498,7 +498,18 @@ fn readSampledInt4( ); } -fn sampleImageFloat4Level(image: *SoftImage, image_view: *SoftImageView, sampler: *Self, dim: spv.SpvDim, x: f32, y: f32, z: f32, mip_level: u32, filter: vk.Filter, offset: ImageOffset) VkError!F32x4 { +fn sampleImageFloat4Level( + image: *SoftImage, + image_view: *SoftImageView, + sampler: *Self, + dim: spv.SpvDim, + x: f32, + y: f32, + z: f32, + mip_level: u32, + filter: vk.Filter, + offset: ImageOffset, +) VkError!F32x4 { const extent = image.getMipLevelExtent(mip_level); const coord: CubeCoordinate = switch (image_view.interface.view_type) { .@"1d_array" => .{ @@ -552,7 +563,17 @@ fn sampleImageFloat4Level(image: *SoftImage, image_view: *SoftImageView, sampler ); } -pub fn sampleImageFloat4(image: *SoftImage, image_view: *SoftImageView, sampler: *Self, dim: spv.SpvDim, x: f32, y: f32, z: f32, lod: ?f32, offset: ImageOffset) VkError!F32x4 { +pub fn sampleImageFloat4( + image: *SoftImage, + image_view: *SoftImageView, + sampler: *Self, + dim: spv.SpvDim, + x: f32, + y: f32, + z: f32, + lod: ?f32, + offset: ImageOffset, +) VkError!F32x4 { const range = image_view.interface.subresource_range; const mip_count = viewMipCount(image_view); const clamped_lod = sampleLod(image_view, sampler, lod);