@@ -142,9 +142,8 @@ HgiVulkanBlitCmds::CopyTextureGpuToCpu(
142142 const VkImageLayout oldLayout = srcTexture->GetImageLayout ();
143143 const auto [srcAccess, srcStage] =
144144 _GetOldAccessAndPipelineStageFlags (oldLayout);
145- HgiVulkanTexture::TransitionImageBarrier (
145+ srcTexture-> LayoutBarrier (
146146 _commandBuffer,
147- srcTexture,
148147 oldLayout,
149148 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, // transition tex to this layout
150149 srcAccess,
@@ -171,9 +170,8 @@ HgiVulkanBlitCmds::CopyTextureGpuToCpu(
171170 // Transition image back to what it was.
172171 VkAccessFlags access = HgiVulkanTexture::GetDefaultAccessFlags (
173172 srcTexture->GetDescriptor ().usage );
174- HgiVulkanTexture::TransitionImageBarrier (
173+ srcTexture-> LayoutBarrier (
175174 _commandBuffer,
176- srcTexture,
177175 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
178176 oldLayout, // transition tex to this layout
179177 HgiVulkanTexture::NO_PENDING_WRITES, // no pending writes
@@ -337,9 +335,8 @@ void HgiVulkanBlitCmds::BlitTexture(HgiTextureHandle src, HgiTextureHandle dst)
337335 const VkImageLayout oldLayoutSrc = srcTexture->GetImageLayout ();
338336 const auto [srcAccessSrc, srcStageSrc] =
339337 _GetOldAccessAndPipelineStageFlags (oldLayoutSrc);
340- HgiVulkanTexture::TransitionImageBarrier (
338+ srcTexture-> LayoutBarrier (
341339 _commandBuffer,
342- srcTexture,
343340 oldLayoutSrc,
344341 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
345342 srcAccessSrc,
@@ -351,9 +348,8 @@ void HgiVulkanBlitCmds::BlitTexture(HgiTextureHandle src, HgiTextureHandle dst)
351348 const VkImageLayout oldLayoutDst = dstTexture->GetImageLayout ();
352349 const auto [srcAccessDst, srcStageDst] =
353350 _GetOldAccessAndPipelineStageFlags (oldLayoutDst);
354- HgiVulkanTexture::TransitionImageBarrier (
351+ dstTexture-> LayoutBarrier (
355352 _commandBuffer,
356- dstTexture,
357353 oldLayoutDst,
358354 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
359355 srcAccessDst,
@@ -373,9 +369,8 @@ void HgiVulkanBlitCmds::BlitTexture(HgiTextureHandle src, HgiTextureHandle dst)
373369 // Transition src image back to what it was.
374370 const VkAccessFlags accessSrc = HgiVulkanTexture::GetDefaultAccessFlags (
375371 srcTexture->GetDescriptor ().usage );
376- HgiVulkanTexture::TransitionImageBarrier (
372+ srcTexture-> LayoutBarrier (
377373 _commandBuffer,
378- srcTexture,
379374 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
380375 oldLayoutSrc,
381376 HgiVulkanTexture::NO_PENDING_WRITES,
@@ -386,9 +381,8 @@ void HgiVulkanBlitCmds::BlitTexture(HgiTextureHandle src, HgiTextureHandle dst)
386381 // Transition dst image back to what it was.
387382 const VkAccessFlags accessDst = HgiVulkanTexture::GetDefaultAccessFlags (
388383 dstTexture->GetDescriptor ().usage );
389- HgiVulkanTexture::TransitionImageBarrier (
384+ dstTexture-> LayoutBarrier (
390385 _commandBuffer,
391- dstTexture,
392386 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
393387 oldLayoutDst,
394388 VK_ACCESS_TRANSFER_WRITE_BIT,
@@ -536,9 +530,8 @@ HgiVulkanBlitCmds::CopyTextureToBuffer(HgiTextureToBufferOp const& copyOp)
536530 VkImageLayout oldLayout = srcTexture->GetImageLayout ();
537531 const auto [srcAccess, srcStage] =
538532 _GetOldAccessAndPipelineStageFlags (oldLayout);
539- HgiVulkanTexture::TransitionImageBarrier (
533+ srcTexture-> LayoutBarrier (
540534 _commandBuffer,
541- srcTexture,
542535 /* oldLayout*/ oldLayout,
543536 /* newLayout*/ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
544537 /* producerAccess*/ srcAccess,
@@ -583,9 +576,8 @@ HgiVulkanBlitCmds::CopyTextureToBuffer(HgiTextureToBufferOp const& copyOp)
583576 // Transition image layout back to original layout.
584577 const VkAccessFlags access = HgiVulkanTexture::GetDefaultAccessFlags (
585578 srcTexture->GetDescriptor ().usage );
586- HgiVulkanTexture::TransitionImageBarrier (
579+ srcTexture-> LayoutBarrier (
587580 _commandBuffer,
588- srcTexture,
589581 /* oldLayout*/ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
590582 /* newLayout*/ oldLayout,
591583 /* producerAccess*/ VK_ACCESS_TRANSFER_WRITE_BIT,
@@ -625,9 +617,8 @@ HgiVulkanBlitCmds::CopyBufferToTexture(HgiBufferToTextureOp const& copyOp)
625617 VkImageLayout oldLayout = dstTexture->GetImageLayout ();
626618 const auto [srcAccess, srcStage] =
627619 _GetOldAccessAndPipelineStageFlags (oldLayout);
628- HgiVulkanTexture::TransitionImageBarrier (
620+ dstTexture-> LayoutBarrier (
629621 _commandBuffer,
630- dstTexture,
631622 /* oldLayout*/ oldLayout,
632623 /* newLayout*/ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
633624 /* producerAccess*/ srcAccess,
@@ -671,9 +662,8 @@ HgiVulkanBlitCmds::CopyBufferToTexture(HgiBufferToTextureOp const& copyOp)
671662 // Transition image layout back to original layout.
672663 const VkAccessFlags access = HgiVulkanTexture::GetDefaultAccessFlags (
673664 dstTexture->GetDescriptor ().usage );
674- HgiVulkanTexture::TransitionImageBarrier (
665+ dstTexture-> LayoutBarrier (
675666 _commandBuffer,
676- dstTexture,
677667 /* oldLayout*/ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
678668 /* newLayout*/ oldLayout,
679669 /* producerAccess*/ VK_ACCESS_TRANSFER_WRITE_BIT,
@@ -717,9 +707,8 @@ HgiVulkanBlitCmds::GenerateMipMaps(HgiTextureHandle const& texture)
717707 const VkImageLayout oldLayout = vkTex->GetImageLayout ();
718708 const auto [srcAccess, srcStage] =
719709 _GetOldAccessAndPipelineStageFlags (oldLayout);
720- HgiVulkanTexture::TransitionImageBarrier (
710+ vkTex-> LayoutBarrier (
721711 _commandBuffer,
722- vkTex,
723712 oldLayout,
724713 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
725714 srcAccess,
@@ -749,9 +738,8 @@ HgiVulkanBlitCmds::GenerateMipMaps(HgiTextureHandle const& texture)
749738 imageBlit.dstOffsets [1 ].z = 1 ;
750739
751740 // Transition current mip level to image blit destination
752- HgiVulkanTexture::TransitionImageBarrier (
741+ vkTex-> LayoutBarrier (
753742 _commandBuffer,
754- vkTex,
755743 oldLayout,
756744 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
757745 srcAccess,
@@ -772,9 +760,8 @@ HgiVulkanBlitCmds::GenerateMipMaps(HgiTextureHandle const& texture)
772760 VK_FILTER_LINEAR);
773761
774762 // Prepare current mip level as image blit source for next level
775- HgiVulkanTexture::TransitionImageBarrier (
763+ vkTex-> LayoutBarrier (
776764 _commandBuffer,
777- vkTex,
778765 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
779766 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
780767 VK_ACCESS_TRANSFER_WRITE_BIT,
@@ -787,9 +774,8 @@ HgiVulkanBlitCmds::GenerateMipMaps(HgiTextureHandle const& texture)
787774 // Return all mips from TRANSFER_SRC to their original layout
788775 const VkAccessFlags access = HgiVulkanTexture::GetDefaultAccessFlags (
789776 vkTex->GetDescriptor ().usage );
790- HgiVulkanTexture::TransitionImageBarrier (
777+ vkTex-> LayoutBarrier (
791778 _commandBuffer,
792- vkTex,
793779 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
794780 oldLayout,
795781 VK_ACCESS_TRANSFER_READ_BIT,
0 commit comments