Set up cache in vulkan to reuse GrVkPrograms (aka VkPipelines)

src/gpu/vk/GrVkGpu.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrVkGpu.h"
 
 #include "GrContextOptions.h"
 #include "GrGeometryProcessor.h"
 #include "GrGpuResourceCacheAccess.h"
 #include "GrMesh.h"
 #include "GrPipeline.h"
 #include "GrRenderTargetPriv.h"
 #include "GrSurfacePriv.h"
 #include "GrTexturePriv.h"
 
 #include "GrVkCommandBuffer.h"
 #include "GrVkImage.h"
 #include "GrVkIndexBuffer.h"
 #include "GrVkMemory.h"
 #include "GrVkPipeline.h"
-#include "GrVkProgram.h"
-#include "GrVkProgramBuilder.h"
-#include "GrVkProgramDesc.h"
+#include "GrVkPipelineState.h"
 #include "GrVkRenderPass.h"
 #include "GrVkResourceProvider.h"
 #include "GrVkTexture.h"
 #include "GrVkTextureRenderTarget.h"
 #include "GrVkTransferBuffer.h"
 #include "GrVkVertexBuffer.h"
 
 #include "SkConfig8888.h"
 
 #include "vk/GrVkInterface.h"
@@ skipping 320 matching lines @@
 
     // wait for all commands to finish
     fResourceProvider.checkCommandBuffers();
     SkDEBUGCODE(VkResult res =) VK_CALL(QueueWaitIdle(fQueue));
     // VK_ERROR_DEVICE_LOST is acceptable when tearing down (see 4.2.4 in spec)
     SkASSERT(VK_SUCCESS == res || VK_ERROR_DEVICE_LOST == res);
  
     // must call this just before we destroy the VkDevice
     fResourceProvider.destroyResources();
 
-#ifdef SK_DEBUG
+#ifdef ENABLE_VK_LAYERS
     VK_CALL(DestroyDebugReportCallbackEXT(fVkInstance, fCallback, nullptr));
 #endif
 
     VK_CALL(DestroyCommandPool(fDevice, fCmdPool, nullptr));
     VK_CALL(DestroyDevice(fDevice, nullptr));
     VK_CALL(DestroyInstance(fVkInstance, nullptr));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ skipping 311 matching lines @@
     imageDesc.fLevels = 1;
     imageDesc.fSamples = 1;
     imageDesc.fImageTiling = linearTiling ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
     imageDesc.fUsageFlags = usageFlags;
     imageDesc.fMemProps = memProps;
 
     GrVkTexture* tex;
     if (renderTarget) {
         tex = GrVkTextureRenderTarget::CreateNewTextureRenderTarget(this, desc, lifeCycle,
                                                                     imageDesc);
-#if 0
-        // This clear can be included to fix warning described in htttps://bugs.skia.org/5045
-        // Obviously we do not want to be clearling needlessly every time we create a render target.
-        SkIRect rect = SkIRect::MakeWH(tex->width(), tex->height());
-        this->clear(rect, GrColor_TRANSPARENT_BLACK, tex->asRenderTarget());
-#endif
     } else {
         tex = GrVkTexture::CreateNewTexture(this, desc, lifeCycle, imageDesc);
     }
 
     if (!tex) {
         return nullptr;
     }
 
     // TODO: We're ignoring MIP levels here.
     if (!texels.empty()) {
@@ skipping 787 matching lines @@
             memcpy(tmpRow, top, tightRowBytes);
             memcpy(top, bottom, tightRowBytes);
             memcpy(bottom, tmpRow, tightRowBytes);
             top += rowBytes;
             bottom -= rowBytes;
         }
     }
 
     return true;
 }
-
 bool GrVkGpu::prepareDrawState(const GrPipeline& pipeline,
                                const GrPrimitiveProcessor& primProc,
                                GrPrimitiveType primitiveType,
                                const GrVkRenderPass& renderPass,
-                               GrVkProgram** program) {
-    // Get GrVkProgramDesc
-    GrVkProgramDesc desc;
-    if (!GrVkProgramDescBuilder::Build(&desc, primProc, pipeline, *this->vkCaps().glslCaps())) {
-        GrCapsDebugf(this->caps(), "Failed to vk program descriptor!\n");
+                               GrVkPipelineState** pipelineState) {
+    *pipelineState = fResourceProvider.findOrCreateCompatiblePipelineState(pipeline,
+                                                                           primProc,
+                                                                           primitiveType,
+                                                                           renderPass);
+    if (!pipelineState) {
         return false;
     }
 
-    *program = GrVkProgramBuilder::CreateProgram(this,
-                                                 pipeline,
-                                                 primProc,
-                                                 primitiveType,
-                                                 desc,
-                                                 renderPass);
-    if (!program) {
-        return false;
-    }
+    (*pipelineState)->setData(this, primProc, pipeline);
 
-    (*program)->setData(this, primProc, pipeline);
-
-    (*program)->bind(this, fCurrentCmdBuffer);
+    (*pipelineState)->bind(this, fCurrentCmdBuffer);
 
     GrVkPipeline::SetDynamicState(this, fCurrentCmdBuffer, pipeline);
 
     return true;
 }
 
 void GrVkGpu::onDraw(const GrPipeline& pipeline,
                      const GrPrimitiveProcessor& primProc,
                      const GrMesh* meshes,
                      int meshCount) {
     if (!meshCount) {
         return;
     }
     GrRenderTarget* rt = pipeline.getRenderTarget();
     GrVkRenderTarget* vkRT = static_cast<GrVkRenderTarget*>(rt);
     const GrVkRenderPass* renderPass = vkRT->simpleRenderPass();
     SkASSERT(renderPass);
 
     fCurrentCmdBuffer->beginRenderPass(this, renderPass, *vkRT);
 
-    GrVkProgram* program = nullptr;
+    GrVkPipelineState* pipelineState = nullptr;
     GrPrimitiveType primitiveType = meshes[0].primitiveType();
-    if (!this->prepareDrawState(pipeline, primProc, primitiveType, *renderPass, &program)) {
+    if (!this->prepareDrawState(pipeline, primProc, primitiveType, *renderPass, &pipelineState)) {
         return;
     }
 
     // Change layout of our render target so it can be used as the color attachment
     VkImageLayout layout = vkRT->currentLayout();
     // Our color attachment is purely a destination and won't be read so don't need to flush or
     // invalidate any caches
     VkPipelineStageFlags srcStageMask = GrVkMemory::LayoutToPipelineStageFlags(layout);
     VkPipelineStageFlags dstStageMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
     VkAccessFlags srcAccessMask = GrVkMemory::LayoutToSrcAccessMask(layout);
@@ skipping 31 matching lines @@
         if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*this->caps())) {
             this->xferBarrier(pipeline.getRenderTarget(), barrierType);
         }
 
         const GrMesh& mesh = meshes[i];
         GrMesh::Iterator iter;
         const GrNonInstancedMesh* nonIdxMesh = iter.init(mesh);
         do {
             if (nonIdxMesh->primitiveType() != primitiveType) {
                 // Technically we don't have to call this here (since there is a safety check in
-                // program:setData but this will allow for quicker freeing of resources if the
-                // program sits in a cache for a while.
-                program->freeTempResources(this);
-                // This free will go away once we setup a program cache, and then the cache will be
-                // responsible for call freeGpuResources.
-                program->freeGPUResources(this);
-                program->unref();
-                SkDEBUGCODE(program = nullptr);
+                // pipelineState:setData but this will allow for quicker freeing of resources if the
+                // pipelineState sits in a cache for a while.
+                pipelineState->freeTempResources(this);
+                pipelineState->unref();
+                SkDEBUGCODE(pipelineState = nullptr);
                 primitiveType = nonIdxMesh->primitiveType();
                 if (!this->prepareDrawState(pipeline, primProc, primitiveType, *renderPass,
-                                            &program)) {
+                                            &pipelineState)) {
                     return;
                 }
             }
-            SkASSERT(program);
+            SkASSERT(pipelineState);
             this->bindGeometry(primProc, *nonIdxMesh);
 
             if (nonIdxMesh->isIndexed()) {
                 fCurrentCmdBuffer->drawIndexed(this,
                                                nonIdxMesh->indexCount(),
                                                1,
                                                nonIdxMesh->startIndex(),
                                                nonIdxMesh->startVertex(),
                                                0);
             } else {
                 fCurrentCmdBuffer->draw(this,
                                         nonIdxMesh->vertexCount(),
                                         1,
                                         nonIdxMesh->startVertex(),
                                         0);
             }
 
             fStats.incNumDraws();
         } while ((nonIdxMesh = iter.next()));
     }
 
     fCurrentCmdBuffer->endRenderPass(this);
 
-    // Technically we don't have to call this here (since there is a safety check in program:setData
-    // but this will allow for quicker freeing of resources if the program sits in a cache for a
-    // while.
-    program->freeTempResources(this);
-    // This free will go away once we setup a program cache, and then the cache will be responsible
-    // for call freeGpuResources.
-    program->freeGPUResources(this);
-    program->unref();
+    // Technically we don't have to call this here (since there is a safety check in
+    // pipelineState:setData but this will allow for quicker freeing of resources if the
+    // pipelineState sits in a cache for a while.
+    pipelineState->freeTempResources(this);
+    pipelineState->unref();
 
 #if SWAP_PER_DRAW
     glFlush();
 #if defined(SK_BUILD_FOR_MAC)
     aglSwapBuffers(aglGetCurrentContext());
     int set_a_break_pt_here = 9;
     aglSwapBuffers(aglGetCurrentContext());
 #elif defined(SK_BUILD_FOR_WIN32)
     SwapBuf();
     int set_a_break_pt_here = 9;
     SwapBuf();
 #endif
 #endif
 }