Index: src/gpu/gl/GrGLGpu.h |
diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h |
index 9cce41c76da178efcbc836f8a0c23cc41914c9e1..ecb3e5adf12c5f5da776dda66fb6e0dd7f3341c3 100644 |
--- a/src/gpu/gl/GrGLGpu.h |
+++ b/src/gpu/gl/GrGLGpu.h |
@@ -54,7 +54,7 @@ public: |
return static_cast<GrGLPathRendering*>(pathRendering()); |
} |
- void discard(GrRenderTarget*) override; |
+ void discard(GrRenderTarget*); |
// Used by GrGLProgram to configure OpenGL state. |
void bindTexture(int unitIdx, const GrTextureParams& params, bool allowSRGBInputs, |
@@ -95,13 +95,25 @@ public: |
// Called by GrGLBuffer after its buffer object has been destroyed. |
void notifyBufferReleased(const GrGLBuffer*); |
+ void draw(const GrPipeline&, |
bsalomon
2016/06/20 16:51:14
Maybe a comment on these that they are the passthr
egdaniel
2016/06/22 15:26:57
Done.
|
+ const GrPrimitiveProcessor&, |
+ const GrMesh*, |
+ int meshCount); |
+ |
+ /** |
+ * Clear the passed in render target. Ignores the draw state and clip. |
+ */ |
+ void clear(const SkIRect& rect, GrColor color, GrRenderTarget* renderTarget); |
+ |
+ void clearStencilClip(const SkIRect& rect, bool insideClip, GrRenderTarget* renderTarget); |
+ |
const GrGLContext* glContextForTesting() const override { |
return &this->glContext(); |
} |
void clearStencil(GrRenderTarget*) override; |
- GrGpuCommandBuffer* createCommandBuffer(const GrRenderTarget& target, |
+ GrGpuCommandBuffer* createCommandBuffer(GrRenderTarget* target, |
GrGpuCommandBuffer::LoadAndStoreOp colorOp, |
GrColor colorClear, |
GrGpuCommandBuffer::LoadAndStoreOp stencilOp, |
@@ -159,10 +171,6 @@ private: |
bool renderTarget, GrGLTexture::TexParams* initialTexParams, |
const SkTArray<GrMipLevel>& texels); |
- void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) override; |
- |
- void onClearStencilClip(GrRenderTarget*, const SkIRect& rect, bool insideClip) override; |
- |
bool onMakeCopyForTextureParams(GrTexture*, const GrTextureParams&, |
GrTextureProducer::CopyParams*) const override; |
@@ -199,11 +207,6 @@ private: |
void onResolveRenderTarget(GrRenderTarget* target) override; |
- void onDraw(const GrPipeline&, |
- const GrPrimitiveProcessor&, |
- const GrMesh*, |
- int meshCount) override; |
- |
bool onCopySurface(GrSurface* dst, |
GrSurface* src, |
const SkIRect& srcRect, |