From ce57552e11776c8f93798c3a2244fa378604b4af Mon Sep 17 00:00:00 2001 From: Jim Van Verth Date: Wed, 21 Jun 2017 15:50:46 +0000 Subject: Revert "Clean up onTransferPixels" This reverts commit f7037d003c936f59e4d02244821e223c2e7af8e8. Reason for revert: Issues on test bots. Original change's description: > Clean up onTransferPixels > > Bug: skia:5126 > Change-Id: I323c50e7854744302007b4ae7bd25e5742c14cbc > Reviewed-on: https://skia-review.googlesource.com/19055 > Commit-Queue: Jim Van Verth > Reviewed-by: Greg Daniel TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,brianosman@google.com Change-Id: I923fda4d5cd8c2896fb347f9b2695b7f83d9137b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:5126 Reviewed-on: https://skia-review.googlesource.com/20444 Reviewed-by: Jim Van Verth Commit-Queue: Jim Van Verth --- src/gpu/gl/GrGLGpu.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/gpu/gl/GrGLGpu.h') diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h index 5897f5dae5..80a12eb7cc 100644 --- a/src/gpu/gl/GrGLGpu.h +++ b/src/gpu/gl/GrGLGpu.h @@ -247,7 +247,7 @@ private: GrPixelConfig config, const SkTArray& texels) override; - bool onTransferPixels(GrTexture*, + bool onTransferPixels(GrSurface*, int left, int top, int width, int height, GrPixelConfig config, GrBuffer* transferBuffer, size_t offset, size_t rowBytes) override; @@ -373,8 +373,9 @@ private: // helper for onCreateTexture and writeTexturePixels enum UploadType { - kNewTexture_UploadType, // we are creating a new texture - kWrite_UploadType, // we are using TexSubImage2D to copy data to an existing texture + kNewTexture_UploadType, // we are creating a new texture + kWrite_UploadType, // we are using TexSubImage2D to copy data to an existing texture + kTransfer_UploadType, // we are using a transfer buffer to copy data }; bool uploadTexData(GrPixelConfig texConfig, int texWidth, int texHeight, GrSurfaceOrigin texOrigin, GrGLenum target, UploadType uploadType, int left, -- cgit v1.2.3