Index: include/gpu/SkGpuDevice.h |
=================================================================== |
--- include/gpu/SkGpuDevice.h (revision 14079) |
+++ include/gpu/SkGpuDevice.h (working copy) |
@@ -82,14 +82,14 @@ |
// overrides from SkBaseDevice |
virtual int width() const SK_OVERRIDE { |
- return NULL == fRenderTarget ? 0 : fRenderTarget->width(); |
+ return NULL == fRenderTarget1 ? 0 : fRenderTarget1->width(); |
} |
virtual int height() const SK_OVERRIDE { |
- return NULL == fRenderTarget ? 0 : fRenderTarget->height(); |
+ return NULL == fRenderTarget1 ? 0 : fRenderTarget1->height(); |
} |
virtual bool isOpaque() const SK_OVERRIDE { |
- return NULL == fRenderTarget ? false |
- : kRGB_565_GrPixelConfig == fRenderTarget->config(); |
+ return NULL == fRenderTarget1 ? false |
+ : kRGB_565_GrPixelConfig == fRenderTarget1->config(); |
} |
virtual SkBitmap::Config config() const SK_OVERRIDE; |
@@ -159,7 +159,9 @@ |
/** PRIVATE / EXPERIMENTAL -- do not call */ |
virtual void EXPERIMENTAL_optimize(SkPicture* picture) SK_OVERRIDE; |
/** PRIVATE / EXPERIMENTAL -- do not call */ |
- virtual bool EXPERIMENTAL_drawPicture(SkPicture* picture) SK_OVERRIDE; |
+ virtual bool EXPERIMENTAL_drawPicture(SkCanvas* canvas, SkPicture* picture) SK_OVERRIDE; |
+ /** PRIVATE / EXPERIMENTAL -- do not call */ |
+ virtual void EXPERIMENTAL_purge() SK_OVERRIDE; |
private: |
GrContext* fContext; |
@@ -172,7 +174,7 @@ |
GrTextContext* fFallbackTextContext; |
// state for our render-target |
- GrRenderTarget* fRenderTarget; |
+ GrRenderTarget* fRenderTarget1; |
bool fNeedClear; |
// called from rt and tex cons |