Refactor creation of GrVkRenderPasses to make them move general

src/gpu/vk/GrVkResourceProvider.h

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #ifndef GrVkResourceProvider_DEFINED
 #define GrVkResourceProvider_DEFINED
 
 #include "GrGpu.h"
+#include "GrResourceHandle.h"
 #include "GrVkDescriptorPool.h"
 #include "GrVkPipelineState.h"
 #include "GrVkResource.h"
 #include "GrVkUtil.h"
 #include "SkTArray.h"
 #include "SkTDynamicHash.h"
 #include "SkTHash.h"
 #include "SkTInternalLList.h"
 
 #include "vk/GrVkDefines.h"
@@ skipping 17 matching lines @@
     void init();
 
     GrVkPipeline* createPipeline(const GrPipeline& pipeline,
                                  const GrPrimitiveProcessor& primProc,
                                  VkPipelineShaderStageCreateInfo* shaderStageInfo,
                                  int shaderStageCount,
                                  GrPrimitiveType primitiveType,
                                  const GrVkRenderPass& renderPass,
                                  VkPipelineLayout layout);
 
+    GR_DEFINE_RESOURCE_HANDLE_CLASS(CompatibleRPHandle);
+
     // Finds or creates a simple render pass that matches the target, increments the refcount,
-    // and returns.
-    const GrVkRenderPass* findOrCreateCompatibleRenderPass(const GrVkRenderTarget& target);
+    // and returns. The caller can optionally pass in a pointer to a CompatibleRPHandle. If this is
+    // non null it will be set to a handle that can be used in the furutre to quickly return a
+    // compatible GrVkRenderPasses without the need inspecting a GrVkRenderTarget.
+    const GrVkRenderPass* findCompatibleRenderPass(const GrVkRenderTarget& target,
+                                                   CompatibleRPHandle* compatibleHandle = nullptr);
+    // The CompatibleRPHandle must be a valid handle previously set by a call to
+    // findCompatibleRenderPass(GrVkRenderTarget&, CompatibleRPHandle*).
+    const GrVkRenderPass* findCompatibleRenderPass(const CompatibleRPHandle& compatibleHandle);
+
+#if 0
+    // TODO:
+    const GrVkRenderPass* findRenderPass(const GrVkRenderTarget& target,
+                                         VkAttachmentLoadOp colorLoad,
+                                         VkAttachmentStoreOp colorStore,
+                                         VkAttachmentLoadOp stencilLoad,
+                                         VkAttachmentStoreOp stencilStore,
+                                         CompatibleRPHandle* compatibleHandle = nullptr);
+
+    const GrVkRenderPass* findRenderPass(const CompatibleRPHandle& compatibleHandle,
+                                         VkAttachmentLoadOp colorLoad,
+                                         VkAttachmentStoreOp colorStore,
+                                         VkAttachmentLoadOp stencilLoad,
+                                         VkAttachmentStoreOp stencilStore);
+#endif
 
     GrVkCommandBuffer* createCommandBuffer();
     void checkCommandBuffers();
 
     // Finds or creates a compatible GrVkDescriptorPool for the requested type and count.
     // The refcount is incremented and a pointer returned.
     // TODO: Currently this will just create a descriptor pool without holding onto a ref itself
     //       so we currently do not reuse them. Rquires knowing if another draw is currently using
     //       the GrVkDescriptorPool, the ability to reset pools, and the ability to purge pools out
     //       of our cache of GrVkDescriptorPools.
@@ skipping 25 matching lines @@
     // For resource tracing to work properly, this should be called after unrefing all other
     // resource usages.
     void destroyResources();
 
     // Abandon any cached resources. To be used when the context/VkDevice is lost.
     // For resource tracing to work properly, this should be called after unrefing all other
     // resource usages.
     void abandonResources();
 
 private:
-
 #ifdef SK_DEBUG
 #define GR_PIPELINE_STATE_CACHE_STATS
 #endif
 
     class PipelineStateCache : public ::SkNoncopyable {
     public:
         PipelineStateCache(GrVkGpu* gpu);
         ~PipelineStateCache();
 
         void abandon();
@@ skipping 19 matching lines @@
         SkTInternalLList<Entry> fLRUList;
 
         GrVkGpu*                    fGpu;
 
 #ifdef GR_PIPELINE_STATE_CACHE_STATS
         int                         fTotalRequests;
         int                         fCacheMisses;
 #endif
     };
 
+
+    class CompatibleRenderPassSet {
+    public:
+        // This will always construct the basic load store render pass so that there is at least
+        // one compatible VkRenderPass that can be used with this set.
+        CompatibleRenderPassSet(const GrVkGpu* gpu, const GrVkRenderTarget& target);
+
+        bool isCompatible(const GrVkRenderTarget& target) const;
+
+        GrVkRenderPass* getCompatibleRenderPass() const {
+            SkASSERT(fRenderPasses[kLoadStore_LoadStoreOp])
+                return fRenderPasses[kLoadStore_LoadStoreOp];
+        }
+
+        void releaseResources(const GrVkGpu* gpu);
+        void abandonResources();
+
+    private:
+        enum LoadStoreOp {
+            kLoadStore_LoadStoreOp,
+            kDCStore_LoadStoreOp,

[jvanverth1, 2016/05/18 20:42:21]

It would be clearer to write out DontCare or Discard. And maybe kLoadAndStore,
kDiscardAndStore, etc.

[egdaniel, 2016/06/02 17:26:25]

Removed enum.

+            kClearStore_LoadStoreOp,
+            kLoadDC_LoadStoreOp,
+            kDCDC_LoadStoreOp,
+            kClearDC_LoadStoreOp,
+
+            kLast_LoadStoreOp = kClearDC_LoadStoreOp
+        };
+        static const int kLoadStoreOpCount = kLast_LoadStoreOp + 1;
+
+        GrVkRenderPass* fRenderPasses[kLoadStoreOpCount];
+    };
+
     // Initialiaze the vkDescriptorSetLayout used for allocating new uniform buffer descritpor sets.
     void initUniformDescObjects();
 
     GrVkGpu* fGpu;
 
     // Central cache for creating pipelines
     VkPipelineCache fPipelineCache;
 
-    // Array of RenderPasses that only have a single color attachment, optional stencil attachment,
-    // optional resolve attachment, and only one subpass
-    SkSTArray<4, GrVkRenderPass*> fSimpleRenderPasses;
+    SkSTArray<4, CompatibleRenderPassSet> fRenderPassArray;
 
     // Array of CommandBuffers that are currently in flight
     SkSTArray<4, GrVkCommandBuffer*> fActiveCommandBuffers;
 
     // Stores GrVkSampler objects that we've already created so we can reuse them across multiple
     // GrVkPipelineStates
     SkTDynamicHash<GrVkSampler, uint16_t> fSamplers;
 
     // Cache of GrVkPipelineStates
     PipelineStateCache* fPipelineStateCache;
 
     // Current pool to allocate uniform descriptor sets from
     const GrVkDescriptorPool* fUniformDescPool;
     VkDescriptorSetLayout  fUniformDescLayout;
     //Curent number of uniform descriptors allocated from the pool
     int                fCurrentUniformDescCount;
     int                fCurrMaxUniDescriptors;
 
     enum {
         kMaxUniformDescriptors = 1024,
         kNumUniformDescPerSet = 2,
         kStartNumUniformDescriptors = 16, // must be less than kMaxUniformDescriptors
     };
 };
 
 #endif