commit c159f946bd76f6057a35f74b495732496c014b7f
author Jim Van Verth <jvanverth@google.com> Mon Jun 10 14:46:51 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 11 14:07:58 2019 +0000
tree eaf19ef669935d39bc744d003a0b20b135a145df
parent 920f6a9bdb08e638a9dd83a9a47c310f68a86246

Minor cleanups to GrMtlGpuRTCommandBuffer

Bug: skia:8243
Change-Id: I80ed04f7bfbcf20549de30822245d8fe2832a810
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/219996
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/gpu/mtl/GrMtlGpuCommandBuffer.h

diff --git a/src/gpu/mtl/GrMtlGpuCommandBuffer.h b/src/gpu/mtl/GrMtlGpuCommandBuffer.h
index 062b228..5ab40b2 100644
--- a/src/gpu/mtl/GrMtlGpuCommandBuffer.h
+++ b/src/gpu/mtl/GrMtlGpuCommandBuffer.h
@@ -72,8 +72,6 @@
     void submit();
 
 private:
-    void addNullCommand();
-
     GrGpu* gpu() override { return fGpu; }
 
     GrMtlPipelineState* prepareDrawState(
@@ -94,7 +92,8 @@
 
     void onClearStencilClip(const GrFixedClip& clip, bool insideStencilMask) override;
 
-    MTLRenderPassDescriptor* createRenderPassDesc() const;
+    void setupRenderPass(const GrGpuRTCommandBuffer::LoadAndStoreInfo& colorInfo,
+                         const GrGpuRTCommandBuffer::StencilLoadAndStoreInfo& stencilInfo);
 
     void bindGeometry(const GrBuffer* vertexBuffer, size_t vertexOffset,
                       const GrBuffer* instanceBuffer);
@@ -121,24 +120,18 @@
     void setVertexBuffer(id<MTLRenderCommandEncoder>, const GrMtlBuffer*, size_t offset,
                          size_t index);
     void resetBufferBindings();
+    void precreateCmdEncoder();
 
-    GrMtlGpu*                                     fGpu;
+    GrMtlGpu*                   fGpu;
     // GrRenderTargetProxy bounds
 #ifdef SK_DEBUG
-    SkRect                                        fBounds;
+    SkRect                      fRTBounds;
 #endif
-    GrGpuRTCommandBuffer::LoadAndStoreInfo        fColorLoadAndStoreInfo;
-    GrGpuRTCommandBuffer::StencilLoadAndStoreInfo fStencilLoadAndStoreInfo;
 
     id<MTLRenderCommandEncoder> fActiveRenderCmdEncoder;
     MTLRenderPassDescriptor*    fRenderPassDesc;
-
-    struct CommandBufferInfo {
-        SkRect fBounds;
-        size_t fCurrentVertexStride;
-    };
-
-    CommandBufferInfo fCommandBufferInfo;
+    SkRect                      fBounds;
+    size_t                      fCurrentVertexStride;
 
     static constexpr size_t kNumBindings = GrMtlUniformHandler::kLastUniformBinding + 3;
     id<MTLBuffer> fBufferBindings[kNumBindings];