1717namespace rx
1818{
1919
20- namespace BufferUtils_comp = vk::InternalShader::BufferUtils_comp;
2120namespace ConvertVertex_comp = vk::InternalShader::ConvertVertex_comp;
2221namespace ImageClear_frag = vk::InternalShader::ImageClear_frag;
2322namespace ImageCopy_frag = vk::InternalShader::ImageCopy_frag;
@@ -32,7 +31,6 @@ namespace
3231// All internal shaders assume there is only one descriptor set, indexed at 0
3332constexpr uint32_t kSetIndex = 0 ;
3433
35- constexpr uint32_t kBufferClearOutputBinding = 0 ;
3634constexpr uint32_t kConvertIndexDestinationBinding = 0 ;
3735constexpr uint32_t kConvertVertexDestinationBinding = 0 ;
3836constexpr uint32_t kConvertVertexSourceBinding = 1 ;
@@ -51,27 +49,6 @@ constexpr uint32_t kOverlayDrawGraphWidgetsBinding = 2;
5149constexpr uint32_t kOverlayDrawCulledWidgetsBinding = 3 ;
5250constexpr uint32_t kOverlayDrawFontBinding = 4 ;
5351
54- uint32_t GetBufferUtilsFlags (size_t dispatchSize, const vk::Format &format)
55- {
56- uint32_t flags = dispatchSize % 64 == 0 ? BufferUtils_comp::kIsAligned : 0 ;
57- const angle::Format &bufferFormat = format.actualBufferFormat ();
58-
59- if (bufferFormat.isSint ())
60- {
61- flags |= BufferUtils_comp::kIsSint ;
62- }
63- else if (bufferFormat.isUint ())
64- {
65- flags |= BufferUtils_comp::kIsUint ;
66- }
67- else
68- {
69- flags |= BufferUtils_comp::kIsFloat ;
70- }
71-
72- return flags;
73- }
74-
7552uint32_t GetConvertVertexFlags (const UtilsVk::ConvertVertexParameters ¶ms)
7653{
7754 bool srcIsSint = params.srcFormat ->isSint ();
@@ -317,10 +294,6 @@ void UtilsVk::destroy(VkDevice device)
317294 mDescriptorPools [f].destroy (device);
318295 }
319296
320- for (vk::ShaderProgramHelper &program : mBufferUtilsPrograms )
321- {
322- program.destroy (device);
323- }
324297 for (vk::ShaderProgramHelper &program : mConvertIndexPrograms )
325298 {
326299 program.destroy (device);
@@ -417,21 +390,6 @@ angle::Result UtilsVk::ensureResourcesInitialized(ContextVk *contextVk,
417390 return angle::Result::Continue;
418391}
419392
420- angle::Result UtilsVk::ensureBufferClearResourcesInitialized (ContextVk *contextVk)
421- {
422- if (mPipelineLayouts [Function::BufferClear].valid ())
423- {
424- return angle::Result::Continue;
425- }
426-
427- VkDescriptorPoolSize setSizes[1 ] = {
428- {VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1 },
429- };
430-
431- return ensureResourcesInitialized (contextVk, Function::BufferClear, setSizes,
432- ArraySize (setSizes), sizeof (BufferUtilsShaderParams));
433- }
434-
435393angle::Result UtilsVk::ensureConvertIndexResourcesInitialized (ContextVk *contextVk)
436394{
437395 if (mPipelineLayouts [Function::ConvertIndexBuffer].valid ())
@@ -731,56 +689,6 @@ angle::Result UtilsVk::setupProgram(ContextVk *contextVk,
731689 return angle::Result::Continue;
732690}
733691
734- angle::Result UtilsVk::clearBuffer (ContextVk *contextVk,
735- vk::BufferHelper *dest,
736- const ClearParameters ¶ms)
737- {
738- ANGLE_TRY (ensureBufferClearResourcesInitialized (contextVk));
739-
740- vk::CommandBuffer *commandBuffer;
741- // Tell the context dest that we are writing to dest.
742- ANGLE_TRY (contextVk->onBufferComputeShaderWrite (dest));
743- ANGLE_TRY (contextVk->endRenderPassAndGetCommandBuffer (&commandBuffer));
744-
745- const vk::Format &destFormat = dest->getViewFormat ();
746-
747- uint32_t flags = BufferUtils_comp::kIsClear | GetBufferUtilsFlags (params.size , destFormat);
748-
749- BufferUtilsShaderParams shaderParams;
750- shaderParams.destOffset = static_cast <uint32_t >(params.offset );
751- shaderParams.size = static_cast <uint32_t >(params.size );
752- shaderParams.clearValue = params.clearValue ;
753-
754- VkDescriptorSet descriptorSet;
755- vk::RefCountedDescriptorPoolBinding descriptorPoolBinding;
756- ANGLE_TRY (allocateDescriptorSet (contextVk, Function::BufferClear, &descriptorPoolBinding,
757- &descriptorSet));
758-
759- VkWriteDescriptorSet writeInfo = {};
760-
761- writeInfo.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
762- writeInfo.dstSet = descriptorSet;
763- writeInfo.dstBinding = kBufferClearOutputBinding ;
764- writeInfo.descriptorCount = 1 ;
765- writeInfo.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
766- writeInfo.pTexelBufferView = dest->getBufferView ().ptr ();
767-
768- vkUpdateDescriptorSets (contextVk->getDevice (), 1 , &writeInfo, 0 , nullptr );
769-
770- vk::RefCounted<vk::ShaderAndSerial> *shader = nullptr ;
771- ANGLE_TRY (contextVk->getShaderLibrary ().getBufferUtils_comp (contextVk, flags, &shader));
772-
773- ANGLE_TRY (setupProgram (contextVk, Function::BufferClear, shader, nullptr ,
774- &mBufferUtilsPrograms [flags], nullptr , descriptorSet, &shaderParams,
775- sizeof (shaderParams), commandBuffer));
776-
777- commandBuffer->dispatch (UnsignedCeilDivide (static_cast <uint32_t >(params.size ), 64 ), 1 , 1 );
778-
779- descriptorPoolBinding.reset ();
780-
781- return angle::Result::Continue;
782- }
783-
784692angle::Result UtilsVk::convertIndexBuffer (ContextVk *contextVk,
785693 vk::BufferHelper *dest,
786694 vk::BufferHelper *src,
0 commit comments