@@ -143,9 +143,8 @@ HgiVulkanBlitCmds::CopyTextureGpuToCpu(
143143 const VkImageLayout oldLayout = srcTexture->GetImageLayout ();
144144 const auto [srcAccess, srcStage] =
145145 _GetOldAccessAndPipelineStageFlags (oldLayout);
146- HgiVulkanTexture::TransitionImageBarrier (
146+ srcTexture-> LayoutBarrier (
147147 _commandBuffer,
148- srcTexture,
149148 oldLayout,
150149 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, // transition tex to this layout
151150 srcAccess,
@@ -172,9 +171,8 @@ HgiVulkanBlitCmds::CopyTextureGpuToCpu(
172171 // Transition image back to what it was.
173172 VkAccessFlags access = HgiVulkanTexture::GetDefaultAccessFlags (
174173 srcTexture->GetDescriptor ().usage );
175- HgiVulkanTexture::TransitionImageBarrier (
174+ srcTexture-> LayoutBarrier (
176175 _commandBuffer,
177- srcTexture,
178176 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
179177 oldLayout, // transition tex to this layout
180178 HgiVulkanTexture::NO_PENDING_WRITES, // no pending writes
@@ -338,9 +336,8 @@ void HgiVulkanBlitCmds::BlitTexture(HgiTextureHandle src, HgiTextureHandle dst)
338336 const VkImageLayout oldLayoutSrc = srcTexture->GetImageLayout ();
339337 const auto [srcAccessSrc, srcStageSrc] =
340338 _GetOldAccessAndPipelineStageFlags (oldLayoutSrc);
341- HgiVulkanTexture::TransitionImageBarrier (
339+ srcTexture-> LayoutBarrier (
342340 _commandBuffer,
343- srcTexture,
344341 oldLayoutSrc,
345342 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
346343 srcAccessSrc,
@@ -352,9 +349,8 @@ void HgiVulkanBlitCmds::BlitTexture(HgiTextureHandle src, HgiTextureHandle dst)
352349 const VkImageLayout oldLayoutDst = dstTexture->GetImageLayout ();
353350 const auto [srcAccessDst, srcStageDst] =
354351 _GetOldAccessAndPipelineStageFlags (oldLayoutDst);
355- HgiVulkanTexture::TransitionImageBarrier (
352+ dstTexture-> LayoutBarrier (
356353 _commandBuffer,
357- dstTexture,
358354 oldLayoutDst,
359355 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
360356 srcAccessDst,
@@ -374,9 +370,8 @@ void HgiVulkanBlitCmds::BlitTexture(HgiTextureHandle src, HgiTextureHandle dst)
374370 // Transition src image back to what it was.
375371 const VkAccessFlags accessSrc = HgiVulkanTexture::GetDefaultAccessFlags (
376372 srcTexture->GetDescriptor ().usage );
377- HgiVulkanTexture::TransitionImageBarrier (
373+ srcTexture-> LayoutBarrier (
378374 _commandBuffer,
379- srcTexture,
380375 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
381376 oldLayoutSrc,
382377 HgiVulkanTexture::NO_PENDING_WRITES,
@@ -387,9 +382,8 @@ void HgiVulkanBlitCmds::BlitTexture(HgiTextureHandle src, HgiTextureHandle dst)
387382 // Transition dst image back to what it was.
388383 const VkAccessFlags accessDst = HgiVulkanTexture::GetDefaultAccessFlags (
389384 dstTexture->GetDescriptor ().usage );
390- HgiVulkanTexture::TransitionImageBarrier (
385+ dstTexture-> LayoutBarrier (
391386 _commandBuffer,
392- dstTexture,
393387 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
394388 oldLayoutDst,
395389 VK_ACCESS_TRANSFER_WRITE_BIT,
@@ -545,9 +539,8 @@ HgiVulkanBlitCmds::CopyTextureToBuffer(HgiTextureToBufferOp const& copyOp)
545539 VkImageLayout oldLayout = srcTexture->GetImageLayout ();
546540 const auto [srcAccess, srcStage] =
547541 _GetOldAccessAndPipelineStageFlags (oldLayout);
548- HgiVulkanTexture::TransitionImageBarrier (
542+ srcTexture-> LayoutBarrier (
549543 _commandBuffer,
550- srcTexture,
551544 /* oldLayout*/ oldLayout,
552545 /* newLayout*/ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
553546 /* producerAccess*/ srcAccess,
@@ -592,9 +585,8 @@ HgiVulkanBlitCmds::CopyTextureToBuffer(HgiTextureToBufferOp const& copyOp)
592585 // Transition image layout back to original layout.
593586 const VkAccessFlags access = HgiVulkanTexture::GetDefaultAccessFlags (
594587 srcTexture->GetDescriptor ().usage );
595- HgiVulkanTexture::TransitionImageBarrier (
588+ srcTexture-> LayoutBarrier (
596589 _commandBuffer,
597- srcTexture,
598590 /* oldLayout*/ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
599591 /* newLayout*/ oldLayout,
600592 /* producerAccess*/ VK_ACCESS_TRANSFER_WRITE_BIT,
@@ -634,9 +626,8 @@ HgiVulkanBlitCmds::CopyBufferToTexture(HgiBufferToTextureOp const& copyOp)
634626 VkImageLayout oldLayout = dstTexture->GetImageLayout ();
635627 const auto [srcAccess, srcStage] =
636628 _GetOldAccessAndPipelineStageFlags (oldLayout);
637- HgiVulkanTexture::TransitionImageBarrier (
629+ dstTexture-> LayoutBarrier (
638630 _commandBuffer,
639- dstTexture,
640631 /* oldLayout*/ oldLayout,
641632 /* newLayout*/ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
642633 /* producerAccess*/ srcAccess,
@@ -680,9 +671,8 @@ HgiVulkanBlitCmds::CopyBufferToTexture(HgiBufferToTextureOp const& copyOp)
680671 // Transition image layout back to original layout.
681672 const VkAccessFlags access = HgiVulkanTexture::GetDefaultAccessFlags (
682673 dstTexture->GetDescriptor ().usage );
683- HgiVulkanTexture::TransitionImageBarrier (
674+ dstTexture-> LayoutBarrier (
684675 _commandBuffer,
685- dstTexture,
686676 /* oldLayout*/ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
687677 /* newLayout*/ oldLayout,
688678 /* producerAccess*/ VK_ACCESS_TRANSFER_WRITE_BIT,
@@ -726,9 +716,8 @@ HgiVulkanBlitCmds::GenerateMipMaps(HgiTextureHandle const& texture)
726716 const VkImageLayout oldLayout = vkTex->GetImageLayout ();
727717 const auto [srcAccess, srcStage] =
728718 _GetOldAccessAndPipelineStageFlags (oldLayout);
729- HgiVulkanTexture::TransitionImageBarrier (
719+ vkTex-> LayoutBarrier (
730720 _commandBuffer,
731- vkTex,
732721 oldLayout,
733722 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
734723 srcAccess,
@@ -758,9 +747,8 @@ HgiVulkanBlitCmds::GenerateMipMaps(HgiTextureHandle const& texture)
758747 imageBlit.dstOffsets [1 ].z = 1 ;
759748
760749 // Transition current mip level to image blit destination
761- HgiVulkanTexture::TransitionImageBarrier (
750+ vkTex-> LayoutBarrier (
762751 _commandBuffer,
763- vkTex,
764752 oldLayout,
765753 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
766754 srcAccess,
@@ -781,9 +769,8 @@ HgiVulkanBlitCmds::GenerateMipMaps(HgiTextureHandle const& texture)
781769 VK_FILTER_LINEAR);
782770
783771 // Prepare current mip level as image blit source for next level
784- HgiVulkanTexture::TransitionImageBarrier (
772+ vkTex-> LayoutBarrier (
785773 _commandBuffer,
786- vkTex,
787774 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
788775 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
789776 VK_ACCESS_TRANSFER_WRITE_BIT,
@@ -796,9 +783,8 @@ HgiVulkanBlitCmds::GenerateMipMaps(HgiTextureHandle const& texture)
796783 // Return all mips from TRANSFER_SRC to their original layout
797784 const VkAccessFlags access = HgiVulkanTexture::GetDefaultAccessFlags (
798785 vkTex->GetDescriptor ().usage );
799- HgiVulkanTexture::TransitionImageBarrier (
786+ vkTex-> LayoutBarrier (
800787 _commandBuffer,
801- vkTex,
802788 VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
803789 oldLayout,
804790 VK_ACCESS_TRANSFER_READ_BIT,
0 commit comments