allemang.d/zig-experiments
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove vestigial code

Browse Source
This commit is contained in:
David Allemang
2024-04-05 23:50:14 -04:00
parent 7b01cfc330
commit cfb76c2c46
2 changed files with 25 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/main.zig
View File

@@ -50,104 +50,13 @@ const vertices = [_]Vertex{
const indices = [_]Index{ 4, 5, 6, 6, 5, 7 };
// pub fn create_swapchain(
// chain: *std.MultiArrayList(ChainImage),
// swapchain: *vk.SwapchainKHR,
// ally: std.mem.Allocator,
// pdev: vk.PhysicalDevice,
// vki: gfx.InstanceDispatch,
// window: *c.GLFWwindow,
// dev: vk.Device,
// vkd: Device.Wrapper,
// pool: vk.CommandPool,
// surface: vk.SurfaceKHR,
// swap_image_count: u32,
// format: vk.SurfaceFormatKHR,
// present_mode: vk.PresentModeKHR,
// ) !vk.Extent2D {
// const extent = try gfx.find_swap_extent(pdev, vki, surface, window);
//
// const prev_swapchain = swapchain.*;
// swapchain.* = try vkd.createSwapchainKHR(dev, &.{
// .surface = surface,
// .min_image_count = swap_image_count,
// .image_format = format.format,
// .image_color_space = format.color_space,
// .image_extent = extent,
// .image_array_layers = 1,
// .image_usage = .{ .color_attachment_bit = true },
// .image_sharing_mode = .exclusive,
// .pre_transform = .{ .identity_bit_khr = true },
// .composite_alpha = .{ .opaque_bit_khr = true },
// .present_mode = present_mode,
// .clipped = vk.TRUE,
// .old_swapchain = prev_swapchain,
// }, null);
// vkd.destroySwapchainKHR(dev, prev_swapchain, null);
//
// var image_count: u32 = undefined;
// _ = try vkd.getSwapchainImagesKHR(dev, swapchain.*, &image_count, null);
// try chain.resize(ally, image_count);
// _ = try vkd.getSwapchainImagesKHR(dev, swapchain.*, &image_count, chain.items(.image).ptr);
//
// // memset so that deinit_chain will succeed with .null_handle if error part-way through a loop.
// @memset(chain.items(.view), .null_handle);
// @memset(chain.items(.cmdbuf), .null_handle);
// @memset(chain.items(.fence), .null_handle);
// @memset(chain.items(.image_available), .null_handle);
// errdefer deinit_chain(chain.*, dev, vkd, pool);
//
// for (chain.items(.image), chain.items(.view)) |image, *view| {
// view.* = try vkd.createImageView(dev, &.{
// .image = image,
// .view_type = .@"2d",
// .format = format.format,
// .components = .{ .r = .identity, .g = .identity, .b = .identity, .a = .identity },
// .subresource_range = .{
// .aspect_mask = .{ .color_bit = true },
// .base_mip_level = 0,
// .level_count = 1,
// .base_array_layer = 0,
// .layer_count = 1,
// },
// }, null);
// }
//
// for (chain.items(.fence)) |*fence| {
// fence.* = try vkd.createFence(dev, &.{ .flags = .{ .signaled_bit = true } }, null);
// }
//
// for (chain.items(.image_available)) |*sem| {
// sem.* = try vkd.createSemaphore(dev, &.{}, null);
// }
//
// for (chain.items(.render_finished)) |*sem| {
// sem.* = try vkd.createSemaphore(dev, &.{}, null);
// }
//
// try vkd.allocateCommandBuffers(dev, &.{
// .command_buffer_count = @intCast(chain.len),
// .command_pool = pool,
// .level = .primary,
// }, chain.items(.cmdbuf).ptr);
//
// return extent;
// }
//
// pub fn deinit_chain(
// chain: std.MultiArrayList(ChainImage),
// dev: vk.Device,
// vkd: Device.Wrapper,
// pool: vk.CommandPool,
// ) void {
// vkd.freeCommandBuffers(dev, pool, @intCast(chain.len), chain.items(.cmdbuf).ptr);
// for (chain.items(.view)) |view| vkd.destroyImageView(dev, view, null);
// for (chain.items(.fence)) |fence| vkd.destroyFence(dev, fence, null);
// for (chain.items(.image_available)) |sem| vkd.destroySemaphore(dev, sem, null);
// for (chain.items(.render_finished)) |sem| vkd.destroySemaphore(dev, sem, null);
// }
fn render(dev: vk.Device, vkd: Device.Wrapper, swapchain: vk.SwapchainKHR, frame: Swapchain.ChainImage, queue: vk.Queue) !void {
fn render(
dev: vk.Device,
vkd: gfx.Device.Wrapper,
swapchain: vk.SwapchainKHR,
frame: gfx.Swapchain.ChainImage,
queue: vk.Queue,
) !void {
_ = try vkd.waitForFences(dev, 1, @ptrCast(&frame.fence), vk.TRUE, std.math.maxInt(u64));
const result = try vkd.acquireNextImageKHR(
@@ -180,31 +89,24 @@ fn render(dev: vk.Device, vkd: Device.Wrapper, swapchain: vk.SwapchainKHR, frame
});
}
const Base = @import("gfx/Base.zig");
const Instance = @import("gfx/Instance.zig");
const Context = @import("gfx/Context.zig");
const Window = @import("gfx/Window.zig");
const Device = @import("gfx/Device.zig");
const Swapchain = @import("gfx/Swapchain.zig");
pub fn main() !void {
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
defer _ = gpa.deinit();
const ally = gpa.allocator();
const base = try Base.init();
const base = try gfx.Base.init();
defer base.deinit();
const inst = try Instance.init(&base);
const inst = try gfx.Instance.init(&base);
defer inst.deinit();
const win = try Window.init(&inst, "zig-glfw-vulkan", .{ .width = 800, .height = 600 });
const win = try gfx.Window.init(&inst, "zig-glfw-vulkan", .{ .width = 800, .height = 600 });
defer win.deinit();
const dev = try Device.init(ally, &inst, &win);
const dev = try gfx.Device.init(ally, &inst, &win);
defer dev.deinit();
var sc = try Swapchain.create(ally, &dev);
var sc = try gfx.Swapchain.create(ally, &dev);
defer sc.deinit();
const device_local = gfx.VkAllocator.init(dev.pdev, inst.vki);
@@ -228,7 +130,6 @@ pub fn main() !void {
}, null);
defer dev.vkd.destroyBuffer(dev.dev, vertex_buffer, null);
const vertex_mem_reqs = dev.vkd.getBufferMemoryRequirements(dev.dev, vertex_buffer);
// const vertex_memory = try gfx.allocate(pdev, vki, dev, dev.vkd, vertex_mem_reqs, .{ .device_local_bit = true });
const vertex_memory = try device_local.alloc(dev.dev, dev.vkd, vertex_mem_reqs, .{ .device_local_bit = true });
defer dev.vkd.freeMemory(dev.dev, vertex_memory, null);
try dev.vkd.bindBufferMemory(dev.dev, vertex_buffer, vertex_memory, 0);
@@ -242,7 +143,6 @@ pub fn main() !void {
}, null);
defer dev.vkd.destroyBuffer(dev.dev, index_buffer, null);
const index_mem_reqs = dev.vkd.getBufferMemoryRequirements(dev.dev, index_buffer);
// const index_memory = try gfx.allocate(pdev, vki, dev, dev.vkd, index_mem_reqs, .{ .device_local_bit = true });
const index_memory = try device_local.alloc(dev.dev, dev.vkd, index_mem_reqs, .{ .device_local_bit = true });
defer dev.vkd.freeMemory(dev.dev, index_memory, null);
try dev.vkd.bindBufferMemory(dev.dev, index_buffer, index_memory, 0);
@@ -295,7 +195,7 @@ pub fn main() !void {
fn record_cmdbuf(
cmdbuf: vk.CommandBuffer,
vkd: Device.Wrapper,
vkd: gfx.Device.Wrapper,
image: vk.Image,
view: vk.ImageView,
extent: vk.Extent2D,
@@ -416,7 +316,12 @@ fn record_cmdbuf(
try vkd.endCommandBuffer(cmdbuf);
}
fn createPipeline(dev: vk.Device, layout: vk.PipelineLayout, format: vk.SurfaceFormatKHR, vkd: Device.Wrapper) !vk.Pipeline {
fn createPipeline(
dev: vk.Device,
layout: vk.PipelineLayout,
format: vk.SurfaceFormatKHR,
vkd: gfx.Device.Wrapper,
) !vk.Pipeline {
const vert = try vkd.createShaderModule(dev, &.{
.code_size = shaders.triangle_vert.len,
.p_code = @as([*]const u32, @ptrCast(&shaders.triangle_vert)),