Skip to content

Commit c1b3c2d

Browse files
authored
Unify vkb::RenderPipeline and vkb::rendering::HPPRenderPipeline into vkb::rendering::RenderPipeline<bindingType> (KhronosGroup#1474)
* Unify vkb::RenderPipeline and vkb::rendering::HPPRenderPipeline into vkb::rendering::RenderPipeline<bindingType> * Rebase
1 parent bb630ff commit c1b3c2d

37 files changed

Lines changed: 333 additions & 339 deletions

File tree

framework/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,13 @@ set(RENDERING_FILES
110110
rendering/render_target.h
111111
rendering/subpass.h
112112
rendering/hpp_pipeline_state.h
113-
rendering/hpp_render_pipeline.h
114113
rendering/hpp_render_target.h
115114
# Source files
116115
rendering/pipeline_state.cpp
117116
rendering/postprocessing_pipeline.cpp
118117
rendering/postprocessing_pass.cpp
119118
rendering/postprocessing_renderpass.cpp
120119
rendering/postprocessing_computepass.cpp
121-
rendering/render_pipeline.cpp
122120
rendering/render_target.cpp
123121
rendering/hpp_render_target.cpp)
124122

framework/common/hpp_resource_caching.h

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2023-2025, NVIDIA CORPORATION. All rights reserved.
1+
/* Copyright (c) 2023-2026, NVIDIA CORPORATION. All rights reserved.
22
*
33
* SPDX-License-Identifier: Apache-2.0
44
*
@@ -254,24 +254,14 @@ struct hash<vkb::rendering::HPPRenderTarget>
254254
{
255255
size_t operator()(const vkb::rendering::HPPRenderTarget &render_target) const
256256
{
257-
size_t result = 0;
258-
vkb::hash_combine(result, render_target.get_extent());
259-
for (auto const &view : render_target.get_views())
260-
{
261-
vkb::hash_combine(result, view);
262-
}
263-
for (auto const &attachment : render_target.get_attachments())
264-
{
265-
vkb::hash_combine(result, attachment);
266-
}
267-
for (auto const &input : render_target.get_input_attachments())
268-
{
269-
vkb::hash_combine(result, input);
270-
}
271-
for (auto const &output : render_target.get_output_attachments())
257+
std::size_t result = 0;
258+
259+
for (auto &view : render_target.get_views())
272260
{
273-
vkb::hash_combine(result, output);
261+
vkb::hash_combine(result, view.get_handle());
262+
vkb::hash_combine(result, view.get_image().get_handle());
274263
}
264+
275265
return result;
276266
}
277267
};

framework/rendering/hpp_render_pipeline.h

Lines changed: 0 additions & 50 deletions
This file was deleted.

framework/rendering/postprocessing_renderpass.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2020-2025, Arm Limited and Contributors
1+
/* Copyright (c) 2020-2026, Arm Limited and Contributors
22
*
33
* SPDX-License-Identifier: Apache-2.0
44
*
@@ -316,7 +316,7 @@ class PostProcessingRenderPass : public PostProcessingPass<PostProcessingRenderP
316316
BarrierInfo get_src_barrier_info() const override;
317317
BarrierInfo get_dst_barrier_info() const override;
318318

319-
RenderPipeline pipeline{};
319+
vkb::rendering::RenderPipelineC pipeline{};
320320
std::unique_ptr<core::Sampler> default_sampler{};
321321
std::unique_ptr<core::Sampler> default_sampler_nearest{};
322322
RenderTarget *draw_render_target{nullptr};

framework/rendering/render_pipeline.cpp

Lines changed: 0 additions & 135 deletions
This file was deleted.

0 commit comments

Comments
 (0)