Port to zig 0.17.0
This commit is contained in:
@@ -96,11 +96,11 @@ pub fn load(
|
||||
},
|
||||
.mip_levels = 1,
|
||||
.array_layers = 1,
|
||||
.samples = .{ .@"1_bit" = true },
|
||||
.samples = .{ .@"1" = true },
|
||||
.tiling = .optimal,
|
||||
.usage = .{
|
||||
.transfer_dst_bit = true,
|
||||
.sampled_bit = true,
|
||||
.transfer_dst = true,
|
||||
.sampled = true,
|
||||
},
|
||||
.queue_family_indices = &.{
|
||||
engine.compute_queue.allocation.family,
|
||||
@@ -111,7 +111,7 @@ pub fn load(
|
||||
defer engine.destroyImage(equirect_image);
|
||||
|
||||
const equirect_memory_requirements = engine.getImageMemoryRequirements(equirect_image);
|
||||
const equirect_device_memory = try engine.allocate(equirect_memory_requirements, .{ .device_local_bit = true });
|
||||
const equirect_device_memory = try engine.allocate(equirect_memory_requirements, .{ .device_local = true });
|
||||
defer engine.freeMemory(equirect_device_memory);
|
||||
|
||||
try engine.bindImageMemory(equirect_image, equirect_device_memory, 0);
|
||||
@@ -121,7 +121,7 @@ pub fn load(
|
||||
.view_type = .@"2d",
|
||||
.format = .r16g16b16a16_sfloat,
|
||||
.subresource_range = .{
|
||||
.aspect_mask = .{ .color_bit = true },
|
||||
.aspect_mask = .{ .color = true },
|
||||
.base_mip_level = 0,
|
||||
.level_count = 1,
|
||||
.base_array_layer = 0,
|
||||
@@ -137,19 +137,19 @@ pub fn load(
|
||||
|
||||
try transfer_command_buffer.beginCommandBuffer();
|
||||
transfer_command_buffer.pipelineBarrier(.{
|
||||
.src_stage_mask = .{ .top_of_pipe_bit = true },
|
||||
.dst_stage_mask = .{ .transfer_bit = true },
|
||||
.src_stage_mask = .{ .top_of_pipe = true },
|
||||
.dst_stage_mask = .{ .transfer = true },
|
||||
.image_memory_barriers = &.{
|
||||
.{
|
||||
.src_access_mask = .{},
|
||||
.dst_access_mask = .{ .transfer_write_bit = true },
|
||||
.dst_access_mask = .{ .transfer_write = true },
|
||||
.old_layout = .undefined,
|
||||
.new_layout = .transfer_dst_optimal,
|
||||
.src_queue_family_index = vk.QUEUE_FAMILY_IGNORED,
|
||||
.dst_queue_family_index = vk.QUEUE_FAMILY_IGNORED,
|
||||
.image = equirect_image,
|
||||
.subresource_range = .{
|
||||
.aspect_mask = .{ .color_bit = true },
|
||||
.aspect_mask = .{ .color = true },
|
||||
.base_mip_level = 0,
|
||||
.level_count = 1,
|
||||
.base_array_layer = 0,
|
||||
@@ -168,7 +168,7 @@ pub fn load(
|
||||
.buffer_row_length = img.width,
|
||||
.buffer_image_height = img.height,
|
||||
.image_subresource = .{
|
||||
.aspect_mask = .{ .color_bit = true },
|
||||
.aspect_mask = .{ .color = true },
|
||||
.mip_level = 0,
|
||||
.base_array_layer = 0,
|
||||
.layer_count = 1,
|
||||
@@ -191,19 +191,19 @@ pub fn load(
|
||||
|
||||
try transition1_command_buffer.beginCommandBuffer();
|
||||
transition1_command_buffer.pipelineBarrier(.{
|
||||
.src_stage_mask = .{ .transfer_bit = true },
|
||||
.dst_stage_mask = .{ .compute_shader_bit = true },
|
||||
.src_stage_mask = .{ .transfer = true },
|
||||
.dst_stage_mask = .{ .compute_shader = true },
|
||||
.image_memory_barriers = &.{
|
||||
.{
|
||||
.src_access_mask = .{ .transfer_write_bit = true },
|
||||
.dst_access_mask = .{ .shader_read_bit = true },
|
||||
.src_access_mask = .{ .transfer_write = true },
|
||||
.dst_access_mask = .{ .shader_read = true },
|
||||
.old_layout = .transfer_dst_optimal,
|
||||
.new_layout = .shader_read_only_optimal,
|
||||
.src_queue_family_index = vk.QUEUE_FAMILY_IGNORED,
|
||||
.dst_queue_family_index = vk.QUEUE_FAMILY_IGNORED,
|
||||
.image = equirect_image,
|
||||
.subresource_range = .{
|
||||
.aspect_mask = .{ .color_bit = true },
|
||||
.aspect_mask = .{ .color = true },
|
||||
.base_mip_level = 0,
|
||||
.level_count = 1,
|
||||
.base_array_layer = 0,
|
||||
@@ -222,7 +222,7 @@ pub fn load(
|
||||
// --- CREATE CUBEMAP IMAGE ------------------------------------------------
|
||||
|
||||
const cubemap_image = try engine.createImage(.{
|
||||
.flags = .{ .cube_compatible_bit = true },
|
||||
.flags = .{ .cube_compatible = true },
|
||||
.image_type = .@"2d",
|
||||
.format = .r16g16b16a16_sfloat,
|
||||
.extent = .{
|
||||
@@ -232,11 +232,11 @@ pub fn load(
|
||||
},
|
||||
.mip_levels = 1,
|
||||
.array_layers = 6,
|
||||
.samples = .{ .@"1_bit" = true },
|
||||
.samples = .{ .@"1" = true },
|
||||
.tiling = .optimal,
|
||||
.usage = .{
|
||||
.sampled_bit = true,
|
||||
.storage_bit = true,
|
||||
.sampled = true,
|
||||
.storage = true,
|
||||
},
|
||||
.queue_family_indices = &.{
|
||||
engine.graphics_queue.allocation.family,
|
||||
@@ -247,7 +247,7 @@ pub fn load(
|
||||
errdefer engine.destroyImage(cubemap_image);
|
||||
|
||||
const cubemap_memory_requirements = engine.getImageMemoryRequirements(cubemap_image);
|
||||
const cubemap_device_memory = try engine.allocate(cubemap_memory_requirements, .{ .device_local_bit = true });
|
||||
const cubemap_device_memory = try engine.allocate(cubemap_memory_requirements, .{ .device_local = true });
|
||||
errdefer engine.freeMemory(cubemap_device_memory);
|
||||
|
||||
try engine.bindImageMemory(cubemap_image, cubemap_device_memory, 0);
|
||||
@@ -257,7 +257,7 @@ pub fn load(
|
||||
.view_type = .cube,
|
||||
.format = .r16g16b16a16_sfloat,
|
||||
.subresource_range = .{
|
||||
.aspect_mask = .{ .color_bit = true },
|
||||
.aspect_mask = .{ .color = true },
|
||||
.base_mip_level = 0,
|
||||
.level_count = 1,
|
||||
.base_array_layer = 0,
|
||||
@@ -277,7 +277,7 @@ pub fn load(
|
||||
.view_type = .@"2d_array",
|
||||
.format = .r16g16b16a16_sfloat,
|
||||
.subresource_range = .{
|
||||
.aspect_mask = .{ .color_bit = true },
|
||||
.aspect_mask = .{ .color = true },
|
||||
.base_mip_level = 0,
|
||||
.level_count = 1,
|
||||
.base_array_layer = 0,
|
||||
@@ -313,20 +313,20 @@ pub fn load(
|
||||
.binding = 0,
|
||||
.descriptor_type = .sampler,
|
||||
.descriptor_count = 1,
|
||||
.stage_flags = .{ .compute_bit = true },
|
||||
.stage_flags = .{ .compute = true },
|
||||
.immutable_samplers = &.{sampler},
|
||||
},
|
||||
.{
|
||||
.binding = 1,
|
||||
.descriptor_type = .sampled_image,
|
||||
.descriptor_count = 1,
|
||||
.stage_flags = .{ .compute_bit = true },
|
||||
.stage_flags = .{ .compute = true },
|
||||
},
|
||||
.{
|
||||
.binding = 2,
|
||||
.descriptor_type = .storage_image,
|
||||
.descriptor_count = 1,
|
||||
.stage_flags = .{ .compute_bit = true },
|
||||
.stage_flags = .{ .compute = true },
|
||||
},
|
||||
},
|
||||
});
|
||||
@@ -344,7 +344,7 @@ pub fn load(
|
||||
_ = try engine.device.createComputePipelines(.null_handle, &.{
|
||||
.{
|
||||
.stage = .{
|
||||
.stage = .{ .compute_bit = true },
|
||||
.stage = .{ .compute = true },
|
||||
.module = compute_shader,
|
||||
.p_name = "main",
|
||||
},
|
||||
@@ -423,19 +423,19 @@ pub fn load(
|
||||
|
||||
try compute_command_buffer.beginCommandBuffer();
|
||||
compute_command_buffer.pipelineBarrier(.{
|
||||
.src_stage_mask = .{ .top_of_pipe_bit = true },
|
||||
.dst_stage_mask = .{ .compute_shader_bit = true },
|
||||
.src_stage_mask = .{ .top_of_pipe = true },
|
||||
.dst_stage_mask = .{ .compute_shader = true },
|
||||
.image_memory_barriers = &.{
|
||||
.{
|
||||
.src_access_mask = .{},
|
||||
.dst_access_mask = .{ .shader_write_bit = true },
|
||||
.dst_access_mask = .{ .shader_write = true },
|
||||
.old_layout = .undefined,
|
||||
.new_layout = .general,
|
||||
.src_queue_family_index = vk.QUEUE_FAMILY_IGNORED,
|
||||
.dst_queue_family_index = vk.QUEUE_FAMILY_IGNORED,
|
||||
.image = cubemap_image,
|
||||
.subresource_range = .{
|
||||
.aspect_mask = .{ .color_bit = true },
|
||||
.aspect_mask = .{ .color = true },
|
||||
.base_mip_level = 0,
|
||||
.level_count = 1,
|
||||
.base_array_layer = 0,
|
||||
@@ -453,7 +453,7 @@ pub fn load(
|
||||
.wait_semaphores = &.{
|
||||
.{
|
||||
.semaphore = semaphore_transition_compute,
|
||||
.stage_flags = .{ .compute_shader_bit = true },
|
||||
.stage_flags = .{ .compute_shader = true },
|
||||
},
|
||||
},
|
||||
.signal_semaphores = &.{semaphore_compute_transition},
|
||||
@@ -466,19 +466,19 @@ pub fn load(
|
||||
|
||||
try transition2_command_buffer.beginCommandBuffer();
|
||||
transition2_command_buffer.pipelineBarrier(.{
|
||||
.src_stage_mask = .{ .compute_shader_bit = true },
|
||||
.dst_stage_mask = .{ .fragment_shader_bit = true },
|
||||
.src_stage_mask = .{ .compute_shader = true },
|
||||
.dst_stage_mask = .{ .fragment_shader = true },
|
||||
.image_memory_barriers = &.{
|
||||
.{
|
||||
.src_access_mask = .{ .shader_write_bit = true },
|
||||
.dst_access_mask = .{ .shader_read_bit = true },
|
||||
.src_access_mask = .{ .shader_write = true },
|
||||
.dst_access_mask = .{ .shader_read = true },
|
||||
.old_layout = .general,
|
||||
.new_layout = .shader_read_only_optimal,
|
||||
.src_queue_family_index = vk.QUEUE_FAMILY_IGNORED,
|
||||
.dst_queue_family_index = vk.QUEUE_FAMILY_IGNORED,
|
||||
.image = cubemap_image,
|
||||
.subresource_range = .{
|
||||
.aspect_mask = .{ .color_bit = true },
|
||||
.aspect_mask = .{ .color = true },
|
||||
.base_mip_level = 0,
|
||||
.level_count = 1,
|
||||
.base_array_layer = 0,
|
||||
@@ -560,20 +560,20 @@ pub fn load(
|
||||
.binding = 0,
|
||||
.descriptor_type = .uniform_buffer,
|
||||
.descriptor_count = 1,
|
||||
.stage_flags = .{ .vertex_bit = true },
|
||||
.stage_flags = .{ .vertex = true },
|
||||
},
|
||||
.{
|
||||
.binding = 1,
|
||||
.descriptor_type = .sampler,
|
||||
.descriptor_count = 1,
|
||||
.stage_flags = .{ .fragment_bit = true },
|
||||
.stage_flags = .{ .fragment = true },
|
||||
.immutable_samplers = &.{sampler},
|
||||
},
|
||||
.{
|
||||
.binding = 2,
|
||||
.descriptor_type = .sampled_image,
|
||||
.descriptor_count = 1,
|
||||
.stage_flags = .{ .fragment_bit = true },
|
||||
.stage_flags = .{ .fragment = true },
|
||||
},
|
||||
},
|
||||
});
|
||||
@@ -649,12 +649,12 @@ pub fn load(
|
||||
const pipeline = try engine.createGraphicsPipeline(.{
|
||||
.stages = &.{
|
||||
.{
|
||||
.stage = .{ .vertex_bit = true },
|
||||
.stage = .{ .vertex = true },
|
||||
.module = shader,
|
||||
.name = "vertexMain",
|
||||
},
|
||||
.{
|
||||
.stage = .{ .fragment_bit = true },
|
||||
.stage = .{ .fragment = true },
|
||||
.module = shader,
|
||||
.name = "fragmentMain",
|
||||
},
|
||||
@@ -688,7 +688,7 @@ pub fn load(
|
||||
.depth_clamp_enable = .false,
|
||||
.rasterizer_discard_enable = .false,
|
||||
.polygon_mode = .fill,
|
||||
.cull_mode = .{ .back_bit = true },
|
||||
.cull_mode = .{ .back = true },
|
||||
.front_face = .counter_clockwise,
|
||||
.depth_bias_enable = .false,
|
||||
.depth_bias_constant_factor = 0,
|
||||
@@ -697,7 +697,7 @@ pub fn load(
|
||||
.line_width = 1,
|
||||
},
|
||||
.multisample_state = .{
|
||||
.rasterization_samples = .{ .@"1_bit" = true },
|
||||
.rasterization_samples = .{ .@"1" = true },
|
||||
.sample_shading_enable = .false,
|
||||
.min_sample_shading = 1,
|
||||
.alpha_to_coverage_enable = .false,
|
||||
@@ -743,10 +743,10 @@ pub fn load(
|
||||
.dst_alpha_blend_factor = .zero,
|
||||
.alpha_blend_op = .add,
|
||||
.color_write_mask = .{
|
||||
.r_bit = true,
|
||||
.g_bit = true,
|
||||
.b_bit = true,
|
||||
.a_bit = true,
|
||||
.r = true,
|
||||
.g = true,
|
||||
.b = true,
|
||||
.a = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user