@@ -134,13 +134,16 @@ bool BlitPassVK::OnCopyTextureToTextureCommand(
134134 return true ;
135135 }
136136
137+ // The copy must complete before a later render or compute pass samples the
138+ // destination.
137139 BarrierVK barrier;
138140 barrier.cmd_buffer = cmd_buffer;
139141 barrier.new_layout = vk::ImageLayout::eShaderReadOnlyOptimal;
140- barrier.src_access = {} ;
141- barrier.src_stage = vk::PipelineStageFlagBits::eTopOfPipe ;
142+ barrier.src_access = vk::AccessFlagBits::eTransferWrite ;
143+ barrier.src_stage = vk::PipelineStageFlagBits::eTransfer ;
142144 barrier.dst_access = vk::AccessFlagBits::eShaderRead;
143- barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader;
145+ barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader |
146+ vk::PipelineStageFlagBits::eComputeShader;
144147
145148 return dst.SetLayout (barrier);
146149}
@@ -170,9 +173,9 @@ bool BlitPassVK::OnCopyTextureToBufferCommand(
170173 barrier.src_stage = vk::PipelineStageFlagBits::eFragmentShader |
171174 vk::PipelineStageFlagBits::eTransfer |
172175 vk::PipelineStageFlagBits::eColorAttachmentOutput;
173- barrier. dst_access = vk::AccessFlagBits::eShaderRead;
174- barrier.dst_stage = vk::PipelineStageFlagBits::eVertexShader |
175- vk::PipelineStageFlagBits::eFragmentShader ;
176+ // The copy below reads the image.
177+ barrier.dst_access = vk::AccessFlagBits::eTransferRead;
178+ barrier. dst_stage = vk::PipelineStageFlagBits::eTransfer ;
176179
177180 const auto & dst = DeviceBufferVK::Cast (*destination);
178181
@@ -198,16 +201,21 @@ bool BlitPassVK::OnCopyTextureToBufferCommand(
198201 image_copy //
199202 );
200203
201- // If the buffer is used for readback, then apply a transfer -> host memory
202- // barrier .
203- if (destination-> GetDeviceBufferDescriptor (). readback ) {
204+ // The copy must complete before a later compute pass reads the buffer. If
205+ // the buffer is used for readback, the host reads it too .
206+ {
204207 vk::MemoryBarrier barrier;
205208 barrier.srcAccessMask = vk::AccessFlagBits::eTransferWrite;
206- barrier.dstAccessMask = vk::AccessFlagBits::eHostRead;
209+ barrier.dstAccessMask = vk::AccessFlagBits::eShaderRead;
210+ vk::PipelineStageFlags dst_stage =
211+ vk::PipelineStageFlagBits::eComputeShader;
212+ if (destination->GetDeviceBufferDescriptor ().readback ) {
213+ barrier.dstAccessMask |= vk::AccessFlagBits::eHostRead;
214+ dst_stage |= vk::PipelineStageFlagBits::eHost;
215+ }
207216
208- cmd_buffer.pipelineBarrier (vk::PipelineStageFlagBits::eTransfer,
209- vk::PipelineStageFlagBits::eHost, {}, 1 ,
210- &barrier, 0 , {}, 0 , {});
217+ cmd_buffer.pipelineBarrier (vk::PipelineStageFlagBits::eTransfer, dst_stage,
218+ {}, 1 , &barrier, 0 , {}, 0 , {});
211219 }
212220
213221 return true ;
@@ -222,7 +230,8 @@ bool BlitPassVK::ConvertTextureToShaderRead(
222230 barrier.src_access = vk::AccessFlagBits::eTransferWrite;
223231 barrier.src_stage = vk::PipelineStageFlagBits::eTransfer;
224232 barrier.dst_access = vk::AccessFlagBits::eShaderRead;
225- barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader;
233+ barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader |
234+ vk::PipelineStageFlagBits::eComputeShader;
226235
227236 barrier.new_layout = vk::ImageLayout::eShaderReadOnlyOptimal;
228237
@@ -300,7 +309,8 @@ bool BlitPassVK::OnCopyBufferToTextureCommand(
300309 barrier.src_access = vk::AccessFlagBits::eTransferWrite;
301310 barrier.src_stage = vk::PipelineStageFlagBits::eTransfer;
302311 barrier.dst_access = vk::AccessFlagBits::eShaderRead;
303- barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader;
312+ barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader |
313+ vk::PipelineStageFlagBits::eComputeShader;
304314
305315 barrier.new_layout = vk::ImageLayout::eShaderReadOnlyOptimal;
306316
@@ -382,15 +392,17 @@ bool BlitPassVK::ResizeTexture(const std::shared_ptr<Texture>& source,
382392
383393 );
384394
385- // Convert back to shader read
395+ // Convert back to shader read once the blit completes, for a later render or
396+ // compute pass.
386397
387398 BarrierVK barrier;
388399 barrier.cmd_buffer = cmd_buffer;
389400 barrier.new_layout = vk::ImageLayout::eShaderReadOnlyOptimal;
390- barrier.src_access = {} ;
391- barrier.src_stage = vk::PipelineStageFlagBits::eTopOfPipe ;
401+ barrier.src_access = vk::AccessFlagBits::eTransferWrite ;
402+ barrier.src_stage = vk::PipelineStageFlagBits::eTransfer ;
392403 barrier.dst_access = vk::AccessFlagBits::eShaderRead;
393- barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader;
404+ barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader |
405+ vk::PipelineStageFlagBits::eComputeShader;
394406
395407 return dst.SetLayout (barrier);
396408}
@@ -520,8 +532,9 @@ bool BlitPassVK::OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
520532 barrier.dstAccessMask = vk::AccessFlagBits::eShaderRead;
521533
522534 cmd.pipelineBarrier (vk::PipelineStageFlagBits::eTransfer,
523- vk::PipelineStageFlagBits::eFragmentShader, {}, {}, {},
524- {barrier});
535+ vk::PipelineStageFlagBits::eFragmentShader |
536+ vk::PipelineStageFlagBits::eComputeShader,
537+ {}, {}, {}, {barrier});
525538
526539 // We modified the layouts of this image from underneath it. Tell it its new
527540 // state so it doesn't try to perform redundant transitions under the hood.
0 commit comments