adding buffer-image copies
Build / build (push) Successful in 2m11s
Test / build_and_test (push) Successful in 48m53s

This commit is contained in:
2026-04-12 22:34:58 +02:00
parent 3717fb3790
commit d54c28dcaa
11 changed files with 351 additions and 110 deletions
+29 -1
View File
@@ -5,8 +5,12 @@ const base = @import("base");
const VkError = base.VkError;
const Device = base.Device;
const Buffer = base.Buffer;
const ImageView = base.ImageView;
const SoftBuffer = @import("SoftBuffer.zig");
const SoftImage = @import("SoftImage.zig");
const SoftImageView = @import("SoftImageView.zig");
const SoftSampler = @import("SoftSampler.zig");
const NonDispatchable = base.NonDispatchable;
@@ -19,9 +23,19 @@ const DescriptorBuffer = struct {
size: vk.DeviceSize,
};
const DescriptorTexture = struct {
sampler: ?*SoftSampler,
view: ?*SoftImageView,
};
const DescriptorImage = struct {
object: ?*SoftImage,
};
const Descriptor = union(enum) {
buffer: []DescriptorBuffer,
image: struct {},
texture: []DescriptorTexture,
image: []DescriptorImage,
unsupported: struct {},
};
@@ -49,6 +63,7 @@ pub fn create(device: *base.Device, allocator: std.mem.Allocator, layout: *base.
for (layout.bindings) |binding| {
const struct_size: usize = switch (binding.descriptor_type) {
.storage_buffer, .storage_buffer_dynamic => @sizeOf(DescriptorBuffer),
.storage_image, .input_attachment => @sizeOf(DescriptorImage),
else => 0,
};
@@ -69,6 +84,9 @@ pub fn create(device: *base.Device, allocator: std.mem.Allocator, layout: *base.
.storage_buffer, .storage_buffer_dynamic => descriptor.* = .{
.buffer = local_allocator.alloc(DescriptorBuffer, binding.array_size) catch return VkError.OutOfHostMemory,
},
.storage_image, .input_attachment => descriptor.* = .{
.image = local_allocator.alloc(DescriptorImage, binding.array_size) catch return VkError.OutOfHostMemory,
},
else => {},
}
}
@@ -114,6 +132,16 @@ pub fn write(interface: *Interface, write_data: vk.WriteDescriptorSet) VkError!v
}
}
},
.storage_image, .input_attachment => {
for (write_data.p_image_info, 0..write_data.descriptor_count) |image_info, i| {
const desc = &self.descriptors[write_data.dst_binding].image[i];
desc.* = .{ .object = null };
if (image_info.image_view != .null_handle) {
const image_view = try NonDispatchable(ImageView).fromHandleObject(image_info.image_view);
desc.object = @as(*SoftImage, @alignCast(@fieldParentPtr("interface", image_view.image)));
}
}
},
else => {
self.descriptors[write_data.dst_binding] = .{ .unsupported = .{} };
base.unsupported("descriptor type {s} for writting", .{@tagName(write_data.descriptor_type)});