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

Remove ImageInner #2200

Merged
merged 1 commit into from
May 3, 2023
Merged

Remove ImageInner #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions vulkano/src/command_buffer/commands/clear.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ impl UnsafeCommandBufferBuilder {
let fns = self.device.fns();
(fns.v1_0.cmd_clear_color_image)(
self.handle,
image.inner().image.handle(),
image.inner().handle(),
image_layout.into(),
&clear_value,
ranges.len() as u32,
Expand Down Expand Up @@ -857,7 +857,7 @@ impl UnsafeCommandBufferBuilder {
let fns = self.device.fns();
(fns.v1_0.cmd_clear_depth_stencil_image)(
self.handle,
image.inner().image.handle(),
image.inner().handle(),
image_layout.into(),
&clear_value,
ranges.len() as u32,
Expand Down
161 changes: 33 additions & 128 deletions vulkano/src/command_buffer/commands/copy.rs
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 6 additions & 16 deletions vulkano/src/command_buffer/standard/builder/clear.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ where
let fns = self.device().fns();
(fns.v1_0.cmd_clear_color_image)(
self.handle(),
image_inner.image.handle(),
image_inner.handle(),
image_layout.into(),
&clear_value,
ranges.len() as u32,
Expand All @@ -218,15 +218,10 @@ where
secondary_use_ref: None,
};

for mut subresource_range in regions {
subresource_range.array_layers.start += image_inner.first_layer;
subresource_range.array_layers.end += image_inner.first_layer;
subresource_range.mip_levels.start += image_inner.first_mipmap_level;
subresource_range.mip_levels.end += image_inner.first_mipmap_level;

for subresource_range in regions {
self.resources_usage_state.record_image_access(
&use_ref,
image_inner.image,
image_inner,
subresource_range,
PipelineStageAccess::Clear_TransferWrite,
image_layout,
Expand Down Expand Up @@ -435,7 +430,7 @@ where
let fns = self.device().fns();
(fns.v1_0.cmd_clear_depth_stencil_image)(
self.handle(),
image_inner.image.handle(),
image_inner.handle(),
image_layout.into(),
&clear_value,
ranges.len() as u32,
Expand All @@ -451,15 +446,10 @@ where
secondary_use_ref: None,
};

for mut subresource_range in regions {
subresource_range.array_layers.start += image_inner.first_layer;
subresource_range.array_layers.end += image_inner.first_layer;
subresource_range.mip_levels.start += image_inner.first_mipmap_level;
subresource_range.mip_levels.end += image_inner.first_mipmap_level;

for subresource_range in regions {
self.resources_usage_state.record_image_access(
&use_ref,
image_inner.image,
image_inner,
subresource_range,
PipelineStageAccess::Clear_TransferWrite,
image_layout,
Expand Down
233 changes: 49 additions & 184 deletions vulkano/src/command_buffer/standard/builder/copy.rs
View file
Open in desktop

Large diffs are not rendered by default.

59 changes: 16 additions & 43 deletions vulkano/src/command_buffer/standard/builder/pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2138,17 +2138,11 @@ fn record_descriptor_sets_access(
.layout_for(descriptor_type);
let (use_ref, stage_access_iter) = use_iter(index as u32);

let mut subresource_range = image_view.subresource_range().clone();
subresource_range.array_layers.start += image_inner.first_layer;
subresource_range.array_layers.end += image_inner.first_layer;
subresource_range.mip_levels.start += image_inner.first_mipmap_level;
subresource_range.mip_levels.end += image_inner.first_mipmap_level;

for stage_access in stage_access_iter {
resources_usage_state.record_image_access(
&use_ref,
image_inner.image,
subresource_range.clone(),
image_inner,
image_view.subresource_range().clone(),
stage_access,
layout,
);
Expand All @@ -2169,17 +2163,11 @@ fn record_descriptor_sets_access(
.layout_for(descriptor_type);
let (use_ref, stage_access_iter) = use_iter(index as u32);

let mut subresource_range = image_view.subresource_range().clone();
subresource_range.array_layers.start += image_inner.first_layer;
subresource_range.array_layers.end += image_inner.first_layer;
subresource_range.mip_levels.start += image_inner.first_mipmap_level;
subresource_range.mip_levels.end += image_inner.first_mipmap_level;

for stage_access in stage_access_iter {
resources_usage_state.record_image_access(
&use_ref,
image_inner.image,
subresource_range.clone(),
image_inner,
image_view.subresource_range().clone(),
stage_access,
layout,
);
Expand Down Expand Up @@ -2314,14 +2302,6 @@ fn record_subpass_attachments_access(

let image = image_view.image();
let image_inner = image.inner();
let mut subresource_range = ImageSubresourceRange {
aspects: ImageAspects::DEPTH,
..image_view.subresource_range().clone()
};
subresource_range.array_layers.start += image_inner.first_layer;
subresource_range.array_layers.end += image_inner.first_layer;
subresource_range.mip_levels.start += image_inner.first_mipmap_level;
subresource_range.mip_levels.end += image_inner.first_mipmap_level;

let use_ref = ResourceUseRef {
command_index,
Expand All @@ -2333,8 +2313,11 @@ fn record_subpass_attachments_access(
for &access in accesses {
resources_usage_state.record_image_access(
&use_ref,
image_inner.image,
subresource_range.clone(),
image_inner,
ImageSubresourceRange {
aspects: ImageAspects::DEPTH,
..image_view.subresource_range().clone()
},
access,
image_layout,
);
Expand Down Expand Up @@ -2366,14 +2349,6 @@ fn record_subpass_attachments_access(

let image = image_view.image();
let image_inner = image.inner();
let mut subresource_range = ImageSubresourceRange {
aspects: ImageAspects::STENCIL,
..image_view.subresource_range().clone()
};
subresource_range.array_layers.start += image_inner.first_layer;
subresource_range.array_layers.end += image_inner.first_layer;
subresource_range.mip_levels.start += image_inner.first_mipmap_level;
subresource_range.mip_levels.end += image_inner.first_mipmap_level;

let use_ref = ResourceUseRef {
command_index,
Expand All @@ -2385,8 +2360,11 @@ fn record_subpass_attachments_access(
for &access in accesses {
resources_usage_state.record_image_access(
&use_ref,
image_inner.image,
subresource_range.clone(),
image_inner,
ImageSubresourceRange {
aspects: ImageAspects::STENCIL,
..image_view.subresource_range().clone()
},
access,
image_layout,
);
Expand All @@ -2404,11 +2382,6 @@ fn record_subpass_attachments_access(

let image = image_view.image();
let image_inner = image.inner();
let mut subresource_range = image_view.subresource_range().clone();
subresource_range.array_layers.start += image_inner.first_layer;
subresource_range.array_layers.end += image_inner.first_layer;
subresource_range.mip_levels.start += image_inner.first_mipmap_level;
subresource_range.mip_levels.end += image_inner.first_mipmap_level;

let use_ref = ResourceUseRef {
command_index,
Expand All @@ -2422,8 +2395,8 @@ fn record_subpass_attachments_access(
// TODO: is it possible to only read a color attachment but not write it?
resources_usage_state.record_image_access(
&use_ref,
image_inner.image,
subresource_range,
image_inner,
image_view.subresource_range().clone(),
PipelineStageAccess::ColorAttachmentOutput_ColorAttachmentWrite,
image_layout,
);
Expand Down
Loading