diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-02-20 14:05:36 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-20 19:30:13 +0000 |
| commit | c320b1576850745a1011ada0bcef3de5f9b9f649 (patch) | |
| tree | 125778e9a92ac1deed777367921475fafa45ada2 /src/gpu/GrDeferredProxyUploader.h | |
| parent | adb4fcbbfdbf8ab6a76c1115073f3ddec5a8f3ca (diff) | |
Introduce GrColorType
This begins the journey towards using different types to refer to CPU data and GPU texture formats. This is one part of removing GrPixelConfig and more directly using GL/VK texture formats
GrColorType represents a particular layout of color/gray/alpha channels in CPU memory. It does not refer to texture formats or sRGB-encoding. It is basically SkColorType specialized to the GPU backend with some formats added and some removed.
Read/WritePixel interfaces use GrColorType to describe the CPU side of the transaction.
There's still a lot of punting to GrPixelConfig in API-specific code. There's a lot more to be done.
Bug: 6718
Bug: 7580
Change-Id: I8d813ae9a4416a06596f22a4b87da02091989718
Reviewed-on: https://skia-review.googlesource.com/107264
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/GrDeferredProxyUploader.h')
| -rw-r--r-- | src/gpu/GrDeferredProxyUploader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/GrDeferredProxyUploader.h b/src/gpu/GrDeferredProxyUploader.h index 765a38920c..589fa33dc9 100644 --- a/src/gpu/GrDeferredProxyUploader.h +++ b/src/gpu/GrDeferredProxyUploader.h @@ -55,11 +55,12 @@ public: auto uploadMask = [this, proxy](GrDeferredTextureUploadWritePixelsFn& writePixelsFn) { this->wait(); + GrColorType pixelColorType = SkColorTypeToGrColorType(this->fPixels.info().colorType()); // If the worker thread was unable to allocate pixels, this check will fail, and we'll // end up drawing with an uninitialized mask texture, but at least we won't crash. if (this->fPixels.addr()) { writePixelsFn(proxy, 0, 0, this->fPixels.width(), this->fPixels.height(), - proxy->config(), this->fPixels.addr(), this->fPixels.rowBytes()); + pixelColorType, this->fPixels.addr(), this->fPixels.rowBytes()); } // Upload has finished, so tell the proxy to release this GrDeferredProxyUploader proxy->texPriv().resetDeferredUploader(); |