blender
/
blender
136
426
Fork 613
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

Vulkan: Render graph textures #120821

Merged
Jeroen Bakker merged 53 commits from Jeroen-Bakker/blender:vulkan/render-graph-textures into main 2024-04-19 14:55:49 +02:00
Conversation 1 Commits 53 Files Changed 19 +23 -14
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bdf9375432 - Show all commits

4
source/blender/gpu/vulkan/render_graph/nodes/vk_dispatch_node.hh
View File

@ -48,7 +48,7 @@ class VKDispatchNode : public VKNodeInfo<VKNodeType::DISPATCH,
static void set_node_data(Node &node, const VKDispatchCreateInfo &create_info)
{
node.dispatch = create_info.dispatch_node;
localize_shader_data(node.dispatch.pipeline_data, create_info.dispatch_node.pipeline_data);
vk_pipeline_data_copy(node.dispatch.pipeline_data, create_info.dispatch_node.pipeline_data);
}
/**
@ -56,7 +56,7 @@ class VKDispatchNode : public VKNodeInfo<VKNodeType::DISPATCH,
*/
void free_data(VKDispatchData &data)
{
vk_pipeline_free_data(data.pipeline_data);
vk_pipeline_data_free(data.pipeline_data);
}
/**

33
source/blender/gpu/vulkan/render_graph/nodes/vk_types_pipeline.hh
View File

@ -24,17 +24,14 @@ struct VKPipelineData {
const void *push_constants_data;
};
struct VKBoundPipeline {
VkPipeline vk_pipeline;
VkDescriptorSet vk_descriptor_set;
};
struct VKBoundPipelines {
VKBoundPipeline compute;
VKBoundPipeline graphics;
};
// TODO: This is a copy constructor in disguise.
BLI_INLINE void localize_shader_data(VKPipelineData &dst, const VKPipelineData &src)
/**
* Copy src pipeline data into dst. The push_constant_data will be duplicated and needs to be freed
* using `vk_pipeline_data_free`.
*
* Memory duplication isn't used as push_constant_data in the src doesn't need to be allocated via
* guardedalloc.
*/
BLI_INLINE void vk_pipeline_data_copy(VKPipelineData &dst, const VKPipelineData &src)
{
dst.push_constants_data = nullptr;
dst.push_constants_size = src.push_constants_size;
@ -46,9 +43,21 @@ BLI_INLINE void localize_shader_data(VKPipelineData &dst, const VKPipelineData &
}
}
BLI_INLINE void vk_pipeline_free_data(VKPipelineData &data)
/**
* Free localized data created by `vk_pipeline_data_copy`.
*/
BLI_INLINE void vk_pipeline_data_free(VKPipelineData &data)
{
MEM_SAFE_FREE(data.push_constants_data);
}
struct VKBoundPipeline {
VkPipeline vk_pipeline;
VkDescriptorSet vk_descriptor_set;
};
struct VKBoundPipelines {
VKBoundPipeline compute;
VKBoundPipeline graphics;
};
} // namespace blender::gpu::render_graph