diff options
| -rw-r--r-- | example/HelloWorld.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrContext.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrGpu.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/GrGpu.h | 4 | ||||
| -rw-r--r-- | src/gpu/GrSWMaskHelper.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrTest.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLGpu.h | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/example/HelloWorld.cpp b/example/HelloWorld.cpp index 6833a33828..1cc18fdc8d 100644 --- a/example/HelloWorld.cpp +++ b/example/HelloWorld.cpp @@ -157,7 +157,7 @@ void HelloWorldWindow::draw(SkCanvas* canvas) { if (kRaster_DeviceType == fType) { // need to send the raster bits to the (gpu) window SkImage* snap = fSurface->newImageSnapshot(); - size_t rowBytes; + size_t rowBytes = 0; SkImageInfo info; const void* pixels = snap->peekPixels(&info, &rowBytes); fRenderTarget->writePixels(0, 0, snap->width(), snap->height(), diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 296dfb9e70..2174b8569f 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -268,7 +268,7 @@ bool GrContext::writeSurfacePixels(GrSurface* surface, } GrGpu::WritePixelTempDrawInfo tempDrawInfo; - if (!fGpu->getWritePixelsInfo(surface, width, height, rowBytes, srcConfig, &drawPreference, + if (!fGpu->getWritePixelsInfo(surface, width, height, srcConfig, &drawPreference, &tempDrawInfo)) { return false; } diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index 39d190e052..32072b4976 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -268,7 +268,7 @@ bool GrGpu::getReadPixelsInfo(GrSurface* srcSurface, int width, int height, size return true; } -bool GrGpu::getWritePixelsInfo(GrSurface* dstSurface, int width, int height, size_t rowBytes, +bool GrGpu::getWritePixelsInfo(GrSurface* dstSurface, int width, int height, GrPixelConfig srcConfig, DrawPreference* drawPreference, WritePixelTempDrawInfo* tempDrawInfo) { SkASSERT(drawPreference); @@ -289,7 +289,7 @@ bool GrGpu::getWritePixelsInfo(GrSurface* dstSurface, int width, int height, siz } } - if (!this->onGetWritePixelsInfo(dstSurface, width, height, rowBytes, srcConfig, drawPreference, + if (!this->onGetWritePixelsInfo(dstSurface, width, height, srcConfig, drawPreference, tempDrawInfo)) { return false; } diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h index 27a97e3ea9..0567dd268c 100644 --- a/src/gpu/GrGpu.h +++ b/src/gpu/GrGpu.h @@ -220,7 +220,7 @@ public: * that would allow a successful transfer of the src pixels to the dst. The passed width, * height, and rowBytes, must be non-zero and already reflect clipping to the dst bounds. */ - bool getWritePixelsInfo(GrSurface* dstSurface, int width, int height, size_t rowBytes, + bool getWritePixelsInfo(GrSurface* dstSurface, int width, int height, GrPixelConfig srcConfig, DrawPreference*, WritePixelTempDrawInfo*); /** @@ -532,7 +532,7 @@ private: virtual bool onGetReadPixelsInfo(GrSurface* srcSurface, int readWidth, int readHeight, size_t rowBytes, GrPixelConfig readConfig, DrawPreference*, ReadPixelTempDrawInfo*) = 0; - virtual bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, size_t rowBytes, + virtual bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, GrPixelConfig srcConfig, DrawPreference*, WritePixelTempDrawInfo*) = 0; diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp index 211550a425..f97af4b108 100644 --- a/src/gpu/GrSWMaskHelper.cpp +++ b/src/gpu/GrSWMaskHelper.cpp @@ -279,7 +279,7 @@ void GrSWMaskHelper::toTexture(GrTexture *texture) { desc.fWidth = fPixels.width(); desc.fHeight = fPixels.height(); desc.fConfig = texture->config(); - + // First see if we should compress this texture before uploading. switch (fCompressionMode) { case kNone_CompressionMode: diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp index 257eefdd48..04122e1319 100644 --- a/src/gpu/GrTest.cpp +++ b/src/gpu/GrTest.cpp @@ -296,7 +296,7 @@ public: GrPixelConfig readConfig, DrawPreference*, ReadPixelTempDrawInfo*) override { return false; } - bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, size_t rowBytes, + bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, GrPixelConfig srcConfig, DrawPreference*, WritePixelTempDrawInfo*) override { return false; } diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index be315dab1e..b10592a902 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -659,7 +659,7 @@ GrRenderTarget* GrGLGpu::onWrapBackendRenderTarget(const GrBackendRenderTargetDe //////////////////////////////////////////////////////////////////////////////// bool GrGLGpu::onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, - size_t rowBytes, GrPixelConfig srcConfig, + GrPixelConfig srcConfig, DrawPreference* drawPreference, WritePixelTempDrawInfo* tempDrawInfo) { if (kIndex_8_GrPixelConfig == srcConfig || GrPixelConfigIsCompressed(dstSurface->config())) { diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h index 48645cad53..b9439b7d85 100644 --- a/src/gpu/gl/GrGLGpu.h +++ b/src/gpu/gl/GrGLGpu.h @@ -64,7 +64,7 @@ public: ReadPixelTempDrawInfo*) override; bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, - size_t rowBytes, GrPixelConfig srcConfig, DrawPreference*, + GrPixelConfig srcConfig, DrawPreference*, WritePixelTempDrawInfo*) override; bool initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) const override; |