Metal: refactor RenderUtils to split into multiple util classes.

src/libANGLE/renderer/metal/BufferMtl.h

@@ -63,10 +63,7 @@ class BufferHolderMtl
     // a queue of mtl::Buffer and only let CPU modifies a free mtl::Buffer.
     // So, in order to let GPU use the most recent modified content, one must call this method
     // right before the draw call to retrieved the most up-to-date mtl::Buffer.
-    mtl::BufferRef getCurrentBuffer(const gl::Context *context)
-    {
-        return mIsWeak ? mBufferWeakRef.lock() : mBuffer;
-    }
+    mtl::BufferRef getCurrentBuffer() { return mIsWeak ? mBufferWeakRef.lock() : mBuffer; }
 
   protected:
     mtl::BufferRef mBuffer;
@@ -111,8 +108,7 @@ class BufferMtl : public BufferImpl, public BufferHolderMtl
                                 bool primitiveRestartEnabled,
                                 gl::IndexRange *outRange) override;
 
-    angle::Result getFirstLastIndices(const gl::Context *context,
-                                      gl::DrawElementsType type,
+    angle::Result getFirstLastIndices(gl::DrawElementsType type,
                                       size_t offset,
                                       size_t count,
                                       std::pair<uint32_t, uint32_t> *outIndices) const;

src/libANGLE/renderer/metal/BufferMtl.mm

@@ -228,8 +228,7 @@ angle::Result BufferMtl::getIndexRange(const gl::Context *context,
     return angle::Result::Continue;
 }
 
-angle::Result BufferMtl::getFirstLastIndices(const gl::Context *context,
-                                             gl::DrawElementsType type,
+angle::Result BufferMtl::getFirstLastIndices(gl::DrawElementsType type,
                                              size_t offset,
                                              size_t count,
                                              std::pair<uint32_t, uint32_t> *outIndices) const

src/libANGLE/renderer/metal/ContextMtl.mm

@@ -175,7 +175,7 @@ angle::Result ContextMtl::drawTriFanArraysWithBaseVertex(const gl::Context *cont
         ANGLE_TRY(
             mtl::Buffer::MakeBuffer(this, indexBufferSize, nullptr, &mTriFanArraysIndexBuffer));
         ANGLE_TRY(getDisplay()->getUtils().generateTriFanBufferFromArrays(
-            context, {0, static_cast<uint32_t>(count), mTriFanArraysIndexBuffer, 0}));
+            this, {0, static_cast<uint32_t>(count), mTriFanArraysIndexBuffer, 0}));
     }
 
     ANGLE_TRY(setupDraw(context, gl::PrimitiveMode::TriangleFan, first, count, instances,
@@ -203,7 +203,7 @@ angle::Result ContextMtl::drawTriFanArraysLegacy(const gl::Context *context,
     ANGLE_TRY(AllocateTriangleFanBufferFromPool(this, count, &mTriFanIndexBuffer, &genIdxBuffer,
                                                 &genIdxBufferOffset, &genIndicesCount));
     ANGLE_TRY(getDisplay()->getUtils().generateTriFanBufferFromArrays(
-        context, {static_cast<uint32_t>(first), static_cast<uint32_t>(count), genIdxBuffer,
+        this, {static_cast<uint32_t>(first), static_cast<uint32_t>(count), genIdxBuffer,
                genIdxBufferOffset}));
 
     ANGLE_TRY(setupDraw(context, gl::PrimitiveMode::TriangleFan, first, count, instances,
@@ -314,7 +314,7 @@ angle::Result ContextMtl::drawTriFanElements(const gl::Context *context,
                                                     &genIdxBufferOffset, &genIndicesCount));
 
         ANGLE_TRY(getDisplay()->getUtils().generateTriFanBufferFromElementsArray(
-            context, {type, count, indices, genIdxBuffer, genIdxBufferOffset}));
+            this, {type, count, indices, genIdxBuffer, genIdxBufferOffset}));
 
         ANGLE_TRY(mTriFanIndexBuffer.commit(this));
 
@@ -1552,7 +1552,7 @@ angle::Result ContextMtl::genLineLoopLastSegment(const gl::Context *context,
     if (indexTypeOrNone == gl::DrawElementsType::InvalidEnum)
     {
         ANGLE_TRY(getDisplay()->getUtils().generateLineLoopLastSegment(
-            context, firstVertex, firstVertex + vertexOrIndexCount - 1, newBuffer, 0));
+            this, firstVertex, firstVertex + vertexOrIndexCount - 1, newBuffer, 0));
     }
     else
     {
@@ -1560,7 +1560,7 @@ angle::Result ContextMtl::genLineLoopLastSegment(const gl::Context *context,
         // taken into account
         ASSERT(firstVertex == 0);
         ANGLE_TRY(getDisplay()->getUtils().generateLineLoopLastSegmentFromElementsArray(
-            context, {indexTypeOrNone, vertexOrIndexCount, indices, newBuffer, 0}));
+            this, {indexTypeOrNone, vertexOrIndexCount, indices, newBuffer, 0}));
     }
 
     ANGLE_TRY(mLineLoopIndexBuffer.commit(this));

src/libANGLE/renderer/metal/FrameBufferMtl.mm

@@ -534,9 +534,7 @@ angle::Result FramebufferMtl::clearWithDraw(const gl::Context *context,
     // Start new render encoder if not already.
     mtl::RenderCommandEncoder *encoder = contextMtl->getRenderCommandEncoder(mRenderPassDesc);
 
-    display->getUtils().clearWithDraw(context, encoder, clearOpts);
-
-    return angle::Result::Continue;
+    return display->getUtils().clearWithDraw(context, encoder, clearOpts);
 }
 
 angle::Result FramebufferMtl::clearImpl(const gl::Context *context,

src/libANGLE/renderer/metal/TextureMtl.mm

@@ -1200,9 +1200,7 @@ angle::Result TextureMtl::copySubImageWithDraw(const gl::Context *context,
     blitParams.srcYFlipped  = framebufferMtl->flipY();
     blitParams.dstLuminance = internalFormat.isLUMA();
 
-    displayMtl->getUtils().blitWithDraw(context, cmdEncoder, blitParams);
-
-    return angle::Result::Continue;
+    return displayMtl->getUtils().blitWithDraw(context, cmdEncoder, blitParams);
 }
 
 angle::Result TextureMtl::copySubImageCPU(const gl::Context *context,

src/libANGLE/renderer/metal/VertexArrayMtl.mm

@@ -315,7 +315,7 @@ angle::Result VertexArrayMtl::setupDraw(const gl::Context *glContext,
                 }
                 desc.layouts[bufferIdx].stride = mCurrentArrayBufferStrides[v];
 
-                cmdEncoder->setVertexBuffer(mCurrentArrayBuffers[v]->getCurrentBuffer(glContext),
+                cmdEncoder->setVertexBuffer(mCurrentArrayBuffers[v]->getCurrentBuffer(),
                                             bufferOffset, bufferIdx);
             }
             else
@@ -487,7 +487,7 @@ angle::Result VertexArrayMtl::getIndexBuffer(const gl::Context *context,
         {
             // No conversion needed:
             BufferMtl *bufferMtl = mtl::GetImpl(glElementArrayBuffer);
-            *idxBufferOut        = bufferMtl->getCurrentBuffer(context);
+            *idxBufferOut        = bufferMtl->getCurrentBuffer();
             *idxBufferOffsetOut  = convertedOffset;
         }
     }
@@ -555,10 +555,11 @@ angle::Result VertexArrayMtl::convertIndexBufferGPU(const gl::Context *glContext
                                         &conversion->convertedOffset));
 
     // Do the conversion on GPU.
-    ANGLE_TRY(display->getUtils().convertIndexBuffer(
-        glContext, indexType, static_cast<uint32_t>(indexCount),
-        idxBuffer->getCurrentBuffer(glContext), static_cast<uint32_t>(offset),
-        conversion->convertedBuffer, static_cast<uint32_t>(conversion->convertedOffset)));
+    ANGLE_TRY(display->getUtils().convertIndexBufferGPU(
+        mtl::GetImpl(glContext),
+        {indexType, static_cast<uint32_t>(indexCount), idxBuffer->getCurrentBuffer(),
+         static_cast<uint32_t>(offset), conversion->convertedBuffer,
+         static_cast<uint32_t>(conversion->convertedOffset)}));
 
     ANGLE_TRY(conversion->data.commit(contextMtl));
 
@@ -659,14 +660,13 @@ angle::Result VertexArrayMtl::convertVertexBufferCPU(const gl::Context *glContex
 
     // Cache the last converted results to be re-used later if the buffer's content won't ever be
     // changed.
-    conversion->convertedBuffer =
-        mConvertedArrayBufferHolders[attribIndex].getCurrentBuffer(glContext);
+    conversion->convertedBuffer = mConvertedArrayBufferHolders[attribIndex].getCurrentBuffer();
     conversion->convertedOffset = mCurrentArrayBufferOffsets[attribIndex];
 
 #ifndef NDEBUG
     ANGLE_MTL_OBJC_SCOPE
     {
-        mConvertedArrayBufferHolders[attribIndex].getCurrentBuffer(glContext)->get().label =
+        mConvertedArrayBufferHolders[attribIndex].getCurrentBuffer()->get().label =
             [NSString stringWithFormat:@"Converted from %p offset=%zu stride=%u", srcBuffer,
                                        binding.getOffset(), binding.getStride()];
     }