hodasemi/engine
1
1
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Wiki Activity Actions

Trying to fix missing sky box

Browse source
This commit is contained in:
hodasemi 2025-03-08 08:16:32 +01:00
parent 2dddb4a5ea
commit 8d3b03da24
2 changed files with 46 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
engine/src/scene/rendering/raytracer/raytracer.rs
View file

@ -305,6 +305,47 @@ where
Ok((info_buffer, descriptor_set)) Ok((info_buffer, descriptor_set))
} }
fn copy_source_image(
&self,
buffer_recorder: &mut CommandBufferRecorder<'_>,
current_swapchain_image: &Arc<Image>,
) -> Result<()> {
// bring image into transfer destination mode
buffer_recorder.image_barrier(
&self.target_image,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
VK_PIPELINE_STAGE_TRANSFER_BIT,
);
// transition swapchain image to transfer source mod
buffer_recorder.image_barrier(
current_swapchain_image,
VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
VK_PIPELINE_STAGE_TRANSFER_BIT,
);
buffer_recorder.blit_complete(
current_swapchain_image,
&self.target_image,
VK_FILTER_LINEAR,
);
// bring image into receive mode
buffer_recorder.image_barrier(
&self.target_image,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_IMAGE_LAYOUT_GENERAL,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
);
Ok(())
}
fn present_image( fn present_image(
&self, &self,
buffer_recorder: &mut CommandBufferRecorder<'_>, buffer_recorder: &mut CommandBufferRecorder<'_>,
@ -322,8 +363,8 @@ where
// transition swapchain image to transfer destination // transition swapchain image to transfer destination
buffer_recorder.image_barrier( buffer_recorder.image_barrier(
current_swapchain_image, current_swapchain_image,
VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
); );
@ -334,15 +375,6 @@ where
VK_FILTER_LINEAR, VK_FILTER_LINEAR,
); );
// bring image into receive mode
buffer_recorder.image_barrier(
&self.target_image,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_IMAGE_LAYOUT_GENERAL,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
);
// transition swapchain image to present mode // transition swapchain image to present mode
buffer_recorder.image_barrier( buffer_recorder.image_barrier(
current_swapchain_image, current_swapchain_image,
@ -645,6 +677,8 @@ where
.update(&[DescriptorWrite::storage_buffers(0, &[scene_buffer])])?; .update(&[DescriptorWrite::storage_buffers(0, &[scene_buffer])])?;
} }
self.copy_source_image(buffer_recorder, &images.mono()[index])?;
self.renderer.process( self.renderer.process(
buffer_recorder, buffer_recorder,
&[ &[

3
engine/src/scene/rendering/shaders/raytracing/hardware/default/raygen.rgen
View file

@ -59,9 +59,7 @@ void main()
pay_load_index pay_load_index
); );
// TODO: store depth value
imageStore(output_image, ivec2(gl_LaunchIDEXT.xy), vec4(pay_load.color.xyz, 1.0));
vec3 position; vec3 position;
@ -69,6 +67,7 @@ void main()
position = vec3(INFINITY); position = vec3(INFINITY);
} else { } else {
position = origin.xyz + pay_load.distance * direction.xyz; position = origin.xyz + pay_load.distance * direction.xyz;
imageStore(output_image, ivec2(gl_LaunchIDEXT.xy), vec4(pay_load.color.xyz, 1.0));
} }
imageStore(depth_buffer, ivec2(gl_LaunchIDEXT.xy), vec4(position, 0.0)); imageStore(depth_buffer, ivec2(gl_LaunchIDEXT.xy), vec4(position, 0.0));