| Index: include/gpu/GrContext.h
|
| diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
|
| index 098fdd2fe9c2757c4645d885aac9f54e3f1c318a..3df44638efbfa5034009ded06521f3a3aa7ac264 100644
|
| --- a/include/gpu/GrContext.h
|
| +++ b/include/gpu/GrContext.h
|
| @@ -262,7 +262,7 @@ public:
|
| * @return true if the write succeeded, false if not. The write can fail because of an
|
| * unsupported combination of surface and src configs.
|
| */
|
| - bool writeSurfacePixels(GrSurface* surface,
|
| + bool writeSurfacePixels(GrDrawContext* surfaceDC, GrSurface* surface,
|
| int left, int top, int width, int height,
|
| GrPixelConfig config, const void* buffer,
|
| size_t rowBytes,
|
| @@ -414,9 +414,9 @@ private:
|
| * return NULL.
|
| */
|
| const GrFragmentProcessor* createPMToUPMEffect(GrTexture*, bool swapRAndB,
|
| - const SkMatrix&) const;
|
| + const SkMatrix&, GrRenderTarget* dst) const;
|
| const GrFragmentProcessor* createUPMToPMEffect(GrTexture*, bool swapRAndB,
|
| - const SkMatrix&) const;
|
| + const SkMatrix&, GrRenderTarget* dst) const;
|
| /** Called before either of the above two functions to determine the appropriate fragment
|
| processors for conversions. This must be called by readSurfacePixels before a mutex is
|
| taken, since testingvPM conversions itself will call readSurfacePixels */
|
|
|