Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small Vulkan validation fixes #211

Merged
merged 2 commits into from
Nov 30, 2024
Merged

Small Vulkan validation fixes #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12af73b
vk: fix validation of fullscreen exclusive on windows
kvark Nov 30, 2024
8c6adf6
vk: fix non-stencil depth format
kvark Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions blade-graphics/src/vulkan/pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,17 @@ impl crate::traits::ShaderDevice for super::Context {
.rasterization_samples(vk::SampleCountFlags::TYPE_1)
.sample_mask(&vk_sample_mask);

let mut ds_format = vk::Format::UNDEFINED;
let mut d_format = vk::Format::UNDEFINED;
let mut s_format = vk::Format::UNDEFINED;
let mut vk_depth_stencil = vk::PipelineDepthStencilStateCreateInfo::default();
if let Some(ref ds) = desc.depth_stencil {
ds_format = super::map_texture_format(ds.format);
let ds_format = super::map_texture_format(ds.format);
if ds.format.aspects().contains(crate::TexelAspects::DEPTH) {
d_format = ds_format;
}
if ds.format.aspects().contains(crate::TexelAspects::STENCIL) {
s_format = ds_format;
}

if ds.depth_write_enabled || ds.depth_compare != crate::CompareFunction::Always {
vk_depth_stencil = vk_depth_stencil
Expand Down Expand Up @@ -547,8 +554,8 @@ impl crate::traits::ShaderDevice for super::Context {

let mut rendering_info = vk::PipelineRenderingCreateInfo::default()
.color_attachment_formats(&color_formats)
.depth_attachment_format(ds_format)
.stencil_attachment_format(ds_format);
.depth_attachment_format(d_format)
.stencil_attachment_format(s_format);

let create_info = vk::GraphicsPipelineCreateInfo::default()
.layout(layout.raw)
Expand Down
4 changes: 3 additions & 1 deletion blade-graphics/src/vulkan/surface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,12 @@ impl super::Context {
return Err(crate::NotSupportedError::PlatformNotSupported);
}

let surface_info = vk::PhysicalDeviceSurfaceInfo2KHR {
let mut surface_info = vk::PhysicalDeviceSurfaceInfo2KHR {
surface: raw,
..Default::default()
};
let mut fullscreen_exclusive_win32 = vk::SurfaceFullScreenExclusiveWin32InfoEXT::default();
surface_info = surface_info.push_next(&mut fullscreen_exclusive_win32);
let mut fullscreen_exclusive_ext = vk::SurfaceCapabilitiesFullScreenExclusiveEXT::default();
let mut capabilities2_khr =
vk::SurfaceCapabilities2KHR::default().push_next(&mut fullscreen_exclusive_ext);
Expand Down
Loading