Vulkan: Merge CommandQueue and TaskProcessor.

include/platform/FeaturesVk.h

@@ -337,12 +337,11 @@ struct FeaturesVk : FeatureSetBase
     // Tell Vulkan back-end to use CommandProcessor class to dispatch work to the GPU. The work will
     // happen asynchronously in a different thread if asynchronousCommandProcessing is true.
     // Otherwise use Renderer::CommandQueue to dispatch work.
+    // TODO(jmadill): Merge these two features. b/172704839
     Feature commandProcessor = {"commandProcessor", FeatureCategory::VulkanFeatures,
                                 "Use CommandProcessor class to dispatch work to GPU.", &members,
                                 "http://anglebug.com/4324"};
 
-    // Enable parallel thread execution when commandProcessor is enabled.
-    // Currently off by default.
     Feature asynchronousCommandProcessing = {"asynchronousCommandProcessing",
                                              FeatureCategory::VulkanFeatures,
                                              "Enable/Disable parallel processing of worker thread",

src/libANGLE/renderer/vulkan/CommandProcessor.h

@@ -236,71 +236,6 @@ class CommandQueue final : angle::NonCopyable
     Serial mCurrentQueueSerial;
 };
 
-class TaskProcessor : angle::NonCopyable
-{
-  public:
-    TaskProcessor();
-    ~TaskProcessor();
-
-    angle::Result init(Context *context, std::thread::id threadId);
-    void destroy(VkDevice device);
-
-    angle::Result finishToSerial(Context *context, Serial serial);
-
-    angle::Result submitFrame(Context *context,
-                              egl::ContextPriority priority,
-                              const std::vector<VkSemaphore> &waitSemaphores,
-                              const std::vector<VkPipelineStageFlags> &waitSemaphoreStageMasks,
-                              const Semaphore *signalSemaphore,
-                              Shared<Fence> &&sharedFence,
-                              GarbageList *currentGarbage,
-                              CommandPool *commandPool,
-                              Serial submitQueueSerial);
-    angle::Result queueSubmit(Context *context,
-                              egl::ContextPriority priority,
-                              const VkSubmitInfo &submitInfo,
-                              const Fence *fence,
-                              Serial submitQueueSerial);
-
-    void handleDeviceLost(Context *context);
-
-    angle::Result checkCompletedCommands(Context *context);
-
-    angle::Result flushOutsideRPCommands(Context *context, CommandBufferHelper *outsideRPCommands);
-    angle::Result flushRenderPassCommands(Context *context,
-                                          const RenderPass &renderPass,
-                                          CommandBufferHelper *renderPassCommands);
-
-    Serial reserveSubmitSerial();
-
-    ANGLE_INLINE Serial getLastSubmittedQueueSerial() const { return mLastSubmittedQueueSerial; }
-    ANGLE_INLINE Serial getLastCompletedQueueSerial() const { return mLastCompletedQueueSerial; }
-    ANGLE_INLINE Serial getCurrentQueueSerial() const { return mCurrentQueueSerial; }
-
-  private:
-    bool isValidWorkerThread(Context *context) const;
-
-    angle::Result releaseToCommandBatch(Context *context,
-                                        PrimaryCommandBuffer &&commandBuffer,
-                                        CommandPool *commandPool,
-                                        CommandBatch *batch);
-    angle::Result ensurePrimaryCommandBufferValid(Context *context);
-
-    GarbageQueue mGarbageQueue;
-    std::vector<CommandBatch> mInFlightCommands;
-
-    // Keeps a free list of reusable primary command buffers.
-    PrimaryCommandBuffer mPrimaryCommandBuffer;
-    PersistentCommandPool mPrimaryCommandPool;
-    std::thread::id mThreadId;
-
-    // Queue serial management.
-    AtomicSerialFactory mQueueSerialFactory;
-    Serial mLastCompletedQueueSerial;
-    Serial mLastSubmittedQueueSerial;
-    Serial mCurrentQueueSerial;
-};
-
 // TODO(jmadill): Give this the same API as CommandQueue. b/172704839
 class CommandProcessor : public Context
 {
@@ -308,8 +243,6 @@ class CommandProcessor : public Context
     CommandProcessor(RendererVk *renderer);
     ~CommandProcessor() override;
 
-    angle::Result initTaskProcessor(Context *context);
-
     void handleError(VkResult result,
                      const char *file,
                      const char *function,
@@ -376,7 +309,7 @@ class CommandProcessor : public Context
     bool mWorkerThreadIdle;
     // Command pool to allocate processor thread primary command buffers from
     CommandPool mCommandPool;
-    TaskProcessor mTaskProcessor;
+    CommandQueue mCommandQueue;
 
     std::mutex mQueueSerialMutex;
 

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -911,17 +911,11 @@ angle::Result RendererVk::initialize(DisplayVk *displayVk,
 
     if (getFeatures().commandProcessor.enabled)
     {
-        if (getFeatures().asynchronousCommandProcessing.enabled)
-        {
-            ASSERT(getFeatures().commandProcessor.enabled);
-            mCommandProcessorThread =
-                std::thread(&vk::CommandProcessor::processTasks, &mCommandProcessor);
-            waitForCommandProcessorIdle(displayVk);
-        }
-        else
-        {
-            ANGLE_TRY(mCommandProcessor.initTaskProcessor(displayVk));
-        }
+        // TODO(jmadill): Clean up. b/172704839
+        ASSERT(mFeatures.asynchronousCommandProcessing.enabled);
+        mCommandProcessorThread =
+            std::thread(&vk::CommandProcessor::processTasks, &mCommandProcessor);
+        waitForCommandProcessorIdle(displayVk);
     }
     else
     {