griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Vulkan: Use stamp in stead of version

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/124339
This commit is contained in:
Jeroen Bakker
2024-07-08 12:56:21 +02:00
parent 18b5f510d4
commit 180a257eef
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/vulkan/render_graph/nodes/vk_copy_buffer_node.hh
View File

@@ -46,7 +46,7 @@ class VKCopyBufferNode : public VKNodeInfo<VKNodeType::COPY_BUFFER,
const CreateInfo &create_info) override
{
ResourceWithStamp src_resource = resources.get_buffer(create_info.src_buffer);
ResourceWithStamp dst_resource = resources.get_buffer_and_increase_version(
ResourceWithStamp dst_resource = resources.get_buffer_and_increase_stamp(
create_info.dst_buffer);
node_links.inputs.append(
{src_resource, VK_ACCESS_TRANSFER_READ_BIT, VK_IMAGE_LAYOUT_UNDEFINED});

2
source/blender/gpu/vulkan/render_graph/nodes/vk_copy_image_to_buffer_node.hh
View File

@@ -50,7 +50,7 @@ class VKCopyImageToBufferNode : public VKNodeInfo<VKNodeType::COPY_IMAGE_TO_BUFF
const CreateInfo &create_info) override
{
ResourceWithStamp src_resource = resources.get_image(create_info.src_image);
ResourceWithStamp dst_resource = resources.get_buffer_and_increase_version(
ResourceWithStamp dst_resource = resources.get_buffer_and_increase_stamp(
create_info.dst_buffer);
node_links.inputs.append({src_resource,
VK_ACCESS_TRANSFER_READ_BIT,

2
source/blender/gpu/vulkan/render_graph/nodes/vk_fill_buffer_node.hh
View File

@@ -45,7 +45,7 @@ class VKFillBufferNode : public VKNodeInfo<VKNodeType::FILL_BUFFER,
VKRenderGraphNodeLinks &node_links,
const CreateInfo &create_info) override
{
ResourceWithStamp resource = resources.get_buffer_and_increase_version(create_info.vk_buffer);
ResourceWithStamp resource = resources.get_buffer_and_increase_stamp(create_info.vk_buffer);
node_links.outputs.append({resource, VK_ACCESS_TRANSFER_WRITE_BIT, VK_IMAGE_LAYOUT_UNDEFINED});
}

2
source/blender/gpu/vulkan/render_graph/vk_resource_access_info.cc
View File

@@ -66,7 +66,7 @@ void VKResourceAccessInfo::build_links(VKResourceStateTracker &resources,
for (const VKBufferAccess &buffer_access : buffers) {
const bool writes_to_resource = bool(buffer_access.vk_access_flags & VK_ACCESS_WRITE_MASK);
ResourceWithStamp versioned_resource = writes_to_resource ?
resources.get_buffer_and_increase_version(
resources.get_buffer_and_increase_stamp(
buffer_access.vk_buffer) :
resources.get_buffer(buffer_access.vk_buffer);
if (writes_to_resource) {

2
source/blender/gpu/vulkan/render_graph/vk_resource_state_tracker.cc
View File

@@ -136,7 +136,7 @@ ResourceWithStamp VKResourceStateTracker::get_image_and_increase_stamp(VkImage v
return get_and_increase_stamp(handle, resource);
}
ResourceWithStamp VKResourceStateTracker::get_buffer_and_increase_version(VkBuffer vk_buffer)
ResourceWithStamp VKResourceStateTracker::get_buffer_and_increase_stamp(VkBuffer vk_buffer)
{
ResourceHandle handle = buffer_resources_.lookup(vk_buffer);
Resource &resource = resources_.lookup(handle);

2
source/blender/gpu/vulkan/render_graph/vk_resource_state_tracker.hh
View File

@@ -248,7 +248,7 @@ class VKResourceStateTracker {
* This function is called when adding a node to the render graph, during building resource
* dependencies. See `VKNodeInfo.build_links`
*/
ResourceWithStamp get_buffer_and_increase_version(VkBuffer vk_buffer);
ResourceWithStamp get_buffer_and_increase_stamp(VkBuffer vk_buffer);
/**
* Return the current stamp of the resource.