lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 10:00:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change DoPipelineBarrier to take a size_t count not uint32_t

Browse Source 
* Since we're always passing an array which naturally has a size_t count, this
  makes more sense.
This commit is contained in:
baldurk
2020-01-09 17:40:14 +00:00
parent 6b95072687
commit d671c1ec86
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_common.cpp
+10 -10
View File
@@ -441,31 +441,31 @@ int StageIndex(VkShaderStageFlagBits stageFlag)
return 0;
}
void DoPipelineBarrier(VkCommandBuffer cmd, uint32_t count, const VkImageMemoryBarrier *barriers)
void DoPipelineBarrier(VkCommandBuffer cmd, size_t count, const VkImageMemoryBarrier *barriers)
{
RDCASSERT(cmd != VK_NULL_HANDLE);
ObjDisp(cmd)->CmdPipelineBarrier(Unwrap(cmd), VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0,
NULL, // global memory barriers
0, NULL, // buffer memory barriers
count, barriers); // image memory barriers
NULL, // global memory barriers
0, NULL, // buffer memory barriers
(uint32_t)count, barriers); // image memory barriers
}
void DoPipelineBarrier(VkCommandBuffer cmd, uint32_t count, const VkBufferMemoryBarrier *barriers)
void DoPipelineBarrier(VkCommandBuffer cmd, size_t count, const VkBufferMemoryBarrier *barriers)
{
RDCASSERT(cmd != VK_NULL_HANDLE);
ObjDisp(cmd)->CmdPipelineBarrier(Unwrap(cmd), VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0,
NULL, // global memory barriers
count, barriers, // buffer memory barriers
0, NULL); // image memory barriers
NULL, // global memory barriers
(uint32_t)count, barriers, // buffer memory barriers
0, NULL); // image memory barriers
}
void DoPipelineBarrier(VkCommandBuffer cmd, uint32_t count, const VkMemoryBarrier *barriers)
void DoPipelineBarrier(VkCommandBuffer cmd, size_t count, const VkMemoryBarrier *barriers)
{
RDCASSERT(cmd != VK_NULL_HANDLE);
ObjDisp(cmd)->CmdPipelineBarrier(Unwrap(cmd), VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, count,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, (uint32_t)count,
barriers, // global memory barriers
0, NULL, // buffer memory barriers
0, NULL); // image memory barriers
renderdoc/driver/vulkan/vk_common.h
+5 -3
View File
@@ -92,9 +92,11 @@ VkAccessFlags MakeAccessMask(VkImageLayout layout);
void SanitiseOldImageLayout(VkImageLayout &layout);
void SanitiseNewImageLayout(VkImageLayout &layout);
void DoPipelineBarrier(VkCommandBuffer cmd, uint32_t count, const VkImageMemoryBarrier *barriers);
void DoPipelineBarrier(VkCommandBuffer cmd, uint32_t count, const VkBufferMemoryBarrier *barriers);
void DoPipelineBarrier(VkCommandBuffer cmd, uint32_t count, const VkMemoryBarrier *barriers);
void CombineDepthStencilLayouts(rdcarray<VkImageMemoryBarrier> &barriers);
void DoPipelineBarrier(VkCommandBuffer cmd, size_t count, const VkImageMemoryBarrier *barriers);
void DoPipelineBarrier(VkCommandBuffer cmd, size_t count, const VkBufferMemoryBarrier *barriers);
void DoPipelineBarrier(VkCommandBuffer cmd, size_t count, const VkMemoryBarrier *barriers);
int SampleCount(VkSampleCountFlagBits countFlag);
int SampleIndex(VkSampleCountFlagBits countFlag);
renderdoc/driver/vulkan/vk_initstate.cpp
+2 -2
View File
@@ -2025,7 +2025,7 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, const VkInitialConten
rdcarray<VkImageMemoryBarrier> setupBarriers, cleanupBarriers;
ImageInitializationBarriers(id, live, policy, initialized, imgRefs, setupBarriers,
cleanupBarriers);
DoPipelineBarrier(cmd, (uint32_t)setupBarriers.size(), setupBarriers.data());
DoPipelineBarrier(cmd, setupBarriers.size(), setupBarriers.data());
SubmitExtQBarriers(GetExtQBarriers(setupBarriers));
@@ -2176,7 +2176,7 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, const VkInitialConten
}
}
DoPipelineBarrier(cmd, (uint32_t)cleanupBarriers.size(), cleanupBarriers.data());
DoPipelineBarrier(cmd, cleanupBarriers.size(), cleanupBarriers.data());
vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd));
RDCASSERTEQUAL(vkr, VK_SUCCESS);
renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+1 -1
View File
@@ -1040,7 +1040,7 @@ bool WrappedVulkan::Serialise_vkEndCommandBuffer(SerialiserType &ser, VkCommandB
}
if(!revertBarriers.empty())
DoPipelineBarrier(commandBuffer, (uint32_t)revertBarriers.size(), revertBarriers.data());
DoPipelineBarrier(commandBuffer, revertBarriers.size(), revertBarriers.data());
}
// also finish any nested markers we truncated and didn't finish