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>

1 files changed, 80 insertions, 67 deletions

diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp
index 8f71528da6..1c82ede78a 100755
--- a/tests/TransferPixelsTest.cpp
+++ b/tests/TransferPixelsTest.cpp
@@ -62,7 +62,7 @@ bool does_full_buffer_contain_correct_values(GrColor* srcBuffer,
     return true;
 }
 
-void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPixelConfig config,
+void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrColorType colorType,
                          GrSurfaceOrigin origin, bool renderTarget) {
     if (GrCaps::kNone_MapFlags == context->caps()->mapBufferFlags()) {
         return;
@@ -97,89 +97,102 @@ void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPix
     memcpy(data, srcBuffer.get(), size);
     buffer->unmap();
 
-    // create texture
-    GrSurfaceDesc desc;
-    desc.fFlags = renderTarget ? kRenderTarget_GrSurfaceFlag : kNone_GrSurfaceFlags;
-    desc.fOrigin = origin;
-    desc.fWidth = kTextureWidth;
-    desc.fHeight = kTextureHeight;
-    desc.fConfig = config;
-    desc.fSampleCnt = 1;
-    sk_sp<GrTexture> tex = resourceProvider->createTexture(desc, SkBudgeted::kNo);
-
-    //////////////////////////
-    // transfer full data
-
-    bool result;
-    result = gpu->transferPixels(tex.get(), 0, 0, kTextureWidth, kTextureHeight,
-                                 config, buffer.get(), 0, rowBytes);
-    REPORTER_ASSERT(reporter, result);
-
-    memset(dstBuffer.get(), 0xCDCD, size);
-    result = gpu->readPixels(tex.get(), origin, 0, 0, kTextureWidth, kTextureHeight,
-                             config, dstBuffer.get(), rowBytes);
-    if (result) {
-        REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_values(srcBuffer,
-                                                                          dstBuffer,
-                                                                          kTextureWidth,
-                                                                          kTextureHeight,
-                                                                          kBufferWidth,
-                                                                          kBufferHeight,
-                                                                          origin));
-    }
-
-    //////////////////////////
-    // transfer partial data
+    for (auto srgbEncoding : {GrSRGBEncoded::kNo, GrSRGBEncoded::kYes}) {
+        // create texture
+        GrSurfaceDesc desc;
+        desc.fFlags = renderTarget ? kRenderTarget_GrSurfaceFlag : kNone_GrSurfaceFlags;
+        desc.fOrigin = origin;
+        desc.fWidth = kTextureWidth;
+        desc.fHeight = kTextureHeight;
+        desc.fConfig = GrColorTypeToPixelConfig(colorType, srgbEncoding);
+        desc.fSampleCnt = 1;
+
+        if (kUnknown_GrPixelConfig == desc.fConfig) {
+            SkASSERT(GrSRGBEncoded::kYes == srgbEncoding);
+            continue;
+        }
 
-    const int kLeft = 2;
-    const int kTop = 10;
-    const int kWidth = 10;
-    const int kHeight = 2;
+        if (!context->caps()->isConfigTexturable(desc.fConfig) ||
+            (renderTarget && !context->caps()->isConfigRenderable(desc.fConfig))) {
+            continue;
+        }
 
-    // change color of subrectangle
-    fill_transfer_data(kLeft, kTop, kWidth, kHeight, kBufferWidth, srcBuffer.get());
-    data = buffer->map();
-    memcpy(data, srcBuffer.get(), size);
-    buffer->unmap();
+        sk_sp<GrTexture> tex = resourceProvider->createTexture(desc, SkBudgeted::kNo);
+
+        //////////////////////////
+        // transfer full data
+
+        bool result;
+        result = gpu->transferPixels(tex.get(), 0, 0, kTextureWidth, kTextureHeight, colorType,
+                                     buffer.get(), 0, rowBytes);
+        REPORTER_ASSERT(reporter, result);
+
+        memset(dstBuffer.get(), 0xCDCD, size);
+        result = gpu->readPixels(tex.get(), origin, 0, 0, kTextureWidth, kTextureHeight, colorType,
+                                 dstBuffer.get(), rowBytes);
+        if (result) {
+            REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_values(srcBuffer,
+                                                                              dstBuffer,
+                                                                              kTextureWidth,
+                                                                              kTextureHeight,
+                                                                              kBufferWidth,
+                                                                              kBufferHeight,
+                                                                              origin));
+        }
 
-    size_t offset = sizeof(GrColor)*(kTop*kBufferWidth + kLeft);
-    result = gpu->transferPixels(tex.get(), kLeft, kTop, kWidth, kHeight, config,
-                                 buffer.get(), offset, rowBytes);
-    REPORTER_ASSERT(reporter, result);
-
-    memset(dstBuffer.get(), 0xCDCD, size);
-    result = gpu->readPixels(tex.get(), origin, 0, 0, kTextureWidth, kTextureHeight,
-                             config, dstBuffer.get(), rowBytes);
-    if (result) {
-        REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_values(srcBuffer,
-                                                                          dstBuffer,
-                                                                          kTextureWidth,
-                                                                          kTextureHeight,
-                                                                          kBufferWidth,
-                                                                          kBufferHeight,
-                                                                          origin));
+        //////////////////////////
+        // transfer partial data
+
+        const int kLeft = 2;
+        const int kTop = 10;
+        const int kWidth = 10;
+        const int kHeight = 2;
+
+        // change color of subrectangle
+        fill_transfer_data(kLeft, kTop, kWidth, kHeight, kBufferWidth, srcBuffer.get());
+        data = buffer->map();
+        memcpy(data, srcBuffer.get(), size);
+        buffer->unmap();
+
+        size_t offset = sizeof(GrColor) * (kTop * kBufferWidth + kLeft);
+        result = gpu->transferPixels(tex.get(), kLeft, kTop, kWidth, kHeight, colorType,
+                                     buffer.get(), offset, rowBytes);
+        REPORTER_ASSERT(reporter, result);
+
+        memset(dstBuffer.get(), 0xCDCD, size);
+        result = gpu->readPixels(tex.get(), origin, 0, 0, kTextureWidth, kTextureHeight, colorType,
+                                 dstBuffer.get(), rowBytes);
+        if (result) {
+            REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_values(srcBuffer,
+                                                                              dstBuffer,
+                                                                              kTextureWidth,
+                                                                              kTextureHeight,
+                                                                              kBufferWidth,
+                                                                              kBufferHeight,
+                                                                              origin));
+        }
     }
 }
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(TransferPixelsTest, reporter, ctxInfo) {
     // RGBA
-    basic_transfer_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig,
+    basic_transfer_test(reporter, ctxInfo.grContext(), GrColorType::kRGBA_8888,
                         kTopLeft_GrSurfaceOrigin, false);
-    basic_transfer_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig,
+    basic_transfer_test(reporter, ctxInfo.grContext(), GrColorType::kRGBA_8888,
                         kTopLeft_GrSurfaceOrigin, true);
-    basic_transfer_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig,
+    basic_transfer_test(reporter, ctxInfo.grContext(), GrColorType::kRGBA_8888,
                         kBottomLeft_GrSurfaceOrigin, false);
-    basic_transfer_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig,
+    basic_transfer_test(reporter, ctxInfo.grContext(), GrColorType::kRGBA_8888,
                         kBottomLeft_GrSurfaceOrigin, true);
 
     // BGRA
-    basic_transfer_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig,
+    basic_transfer_test(reporter, ctxInfo.grContext(), GrColorType::kBGRA_8888,
                         kTopLeft_GrSurfaceOrigin, false);
-    basic_transfer_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig,
+    basic_transfer_test(reporter, ctxInfo.grContext(), GrColorType::kBGRA_8888,
                         kTopLeft_GrSurfaceOrigin, true);
-    basic_transfer_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig,
+    basic_transfer_test(reporter, ctxInfo.grContext(), GrColorType::kBGRA_8888,
                         kBottomLeft_GrSurfaceOrigin, false);
-    basic_transfer_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig,
+    basic_transfer_test(reporter, ctxInfo.grContext(), GrColorType::kBGRA_8888,
                         kBottomLeft_GrSurfaceOrigin, true);
 }