Beginning of support for texture rectangles.
Adds support for importing a RECTANGLE texture into Skia via GrTexureProvider::wrapBackendTexture().
Tests read/writing pixels, copySurface, and clear.
Does not add support for texturing from a RECTANGLE texture as the coords will be incorrectly normalized.
BUG=skia:3868
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1583863002
Review URL: https://codereview.chromium.org/1583863002
diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp
new file mode 100644
index 0000000..a98dd34
--- /dev/null
+++ b/tests/RectangleTextureTest.cpp
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "Test.h"
+#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#include "GrDrawContext.h"
+#include "gl/GrGLGpu.h"
+#include "gl/GrGLUtil.h"
+#include "gl/SkGLContext.h"
+
+static void test_read_pixels(skiatest::Reporter* reporter, GrContext* context,
+ GrTexture* rectangleTexture, uint32_t expectedPixelValues[]) {
+ int pixelCnt = rectangleTexture->width() * rectangleTexture->height();
+ SkAutoTMalloc<uint32_t> pixels(pixelCnt);
+ memset(pixels.get(), 0, sizeof(uint32_t)*pixelCnt);
+ bool read = rectangleTexture->readPixels(0, 0, rectangleTexture->width(),
+ rectangleTexture->height(), kRGBA_8888_GrPixelConfig,
+ pixels.get());
+ if (!read) {
+ ERRORF(reporter, "Error reading rectangle texture.");
+ }
+ for (int i = 0; i < pixelCnt; ++i) {
+ if (pixels.get()[i] != expectedPixelValues[i]) {
+ ERRORF(reporter, "Error, rectangle texture pixel value %d should be 0x%08x,"
+ " got 0x%08x.", i, expectedPixelValues[i], pixels.get()[i]);
+ break;
+ }
+ }
+}
+
+static void test_write_pixels(skiatest::Reporter* reporter, GrContext* context,
+ GrTexture* rectangleTexture) {
+ int pixelCnt = rectangleTexture->width() * rectangleTexture->height();
+ SkAutoTMalloc<uint32_t> pixels(pixelCnt);
+ for (int y = 0; y < rectangleTexture->width(); ++y) {
+ for (int x = 0; x < rectangleTexture->height(); ++x) {
+ pixels.get()[y * rectangleTexture->width() + x] = GrColorPackRGBA(x, y, x + y, x * y);
+ }
+ }
+ bool write = rectangleTexture->writePixels(0, 0, rectangleTexture->width(),
+ rectangleTexture->height(), kRGBA_8888_GrPixelConfig,
+ pixels.get());
+ if (!write) {
+ ERRORF(reporter, "Error writing to rectangle texture.");
+ }
+ test_read_pixels(reporter, context, rectangleTexture, pixels.get());
+}
+
+static void test_copy_surface_src(skiatest::Reporter* reporter, GrContext* context,
+ GrTexture* rectangleTexture, uint32_t expectedPixelValues[]) {
+ GrSurfaceDesc copyDstDesc;
+ copyDstDesc.fConfig = kRGBA_8888_GrPixelConfig;
+ copyDstDesc.fWidth = rectangleTexture->width();
+ copyDstDesc.fHeight = rectangleTexture->height();
+ copyDstDesc.fFlags = kRenderTarget_GrSurfaceFlag;
+ SkAutoTUnref<GrTexture> dst(context->textureProvider()->createTexture(copyDstDesc, true));
+ context->copySurface(dst, rectangleTexture);
+ test_read_pixels(reporter, context, dst, expectedPixelValues);
+}
+
+static void test_copy_surface_dst(skiatest::Reporter* reporter, GrContext* context,
+ GrTexture* rectangleTexture) {
+ int pixelCnt = rectangleTexture->width() * rectangleTexture->height();
+ SkAutoTMalloc<uint32_t> pixels(pixelCnt);
+ for (int y = 0; y < rectangleTexture->width(); ++y) {
+ for (int x = 0; x < rectangleTexture->height(); ++x) {
+ pixels.get()[y * rectangleTexture->width() + x] = GrColorPackRGBA(y, x, x * y, x *+ y);
+ }
+ }
+
+ GrSurfaceDesc copySrcDesc;
+ copySrcDesc.fConfig = kRGBA_8888_GrPixelConfig;
+ copySrcDesc.fWidth = rectangleTexture->width();
+ copySrcDesc.fHeight = rectangleTexture->height();
+ copySrcDesc.fFlags = kRenderTarget_GrSurfaceFlag;
+ SkAutoTUnref<GrTexture> src(context->textureProvider()->createTexture(copySrcDesc, true,
+ pixels.get(), 0));
+
+ context->copySurface(rectangleTexture, src);
+ test_read_pixels(reporter, context, rectangleTexture, pixels.get());
+}
+
+static void test_clear(skiatest::Reporter* reporter, GrContext* context,
+ GrTexture* rectangleTexture) {
+ if (rectangleTexture->asRenderTarget()) {
+ SkAutoTUnref<GrDrawContext> dc(context->drawContext(rectangleTexture->asRenderTarget()));
+ if (!dc) {
+ ERRORF(reporter, "Could not get GrDrawContext for rectangle texture.");
+ return;
+ }
+
+ // Clear the whole thing.
+ GrColor color0 = GrColorPackRGBA(0xA, 0xB, 0xC, 0xD);
+ dc->clear(nullptr, color0, false);
+
+ int w = rectangleTexture->width();
+ int h = rectangleTexture->height();
+ int pixelCnt = w * h;
+ SkAutoTMalloc<uint32_t> expectedPixels(pixelCnt);
+
+ // The clear color is a GrColor, our readback is to kRGBA_8888, which may be different.
+ uint32_t expectedColor0;
+ uint8_t* expectedBytes0 = SkTCast<uint8_t*>(&expectedColor0);
+ expectedBytes0[0] = GrColorUnpackR(color0);
+ expectedBytes0[1] = GrColorUnpackG(color0);
+ expectedBytes0[2] = GrColorUnpackB(color0);
+ expectedBytes0[3] = GrColorUnpackA(color0);
+ for (int i = 0; i < rectangleTexture->width() * rectangleTexture->height(); ++i) {
+ expectedPixels.get()[i] = expectedColor0;
+ }
+
+ // Clear the the top to a different color.
+ GrColor color1 = GrColorPackRGBA(0x1, 0x2, 0x3, 0x4);
+ SkIRect rect = SkIRect::MakeWH(w, h/2);
+ dc->clear(&rect, color1, false);
+
+ uint32_t expectedColor1;
+ uint8_t* expectedBytes1 = SkTCast<uint8_t*>(&expectedColor1);
+ expectedBytes1[0] = GrColorUnpackR(color1);
+ expectedBytes1[1] = GrColorUnpackG(color1);
+ expectedBytes1[2] = GrColorUnpackB(color1);
+ expectedBytes1[3] = GrColorUnpackA(color1);
+
+ for (int y = 0; y < h/2; ++y) {
+ for (int x = 0; x < w; ++x) {
+ expectedPixels.get()[y * h + x] = expectedColor1;
+ }
+ }
+
+ test_read_pixels(reporter, context, rectangleTexture, expectedPixels.get());
+ }
+}
+
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(RectangleTexture, reporter, context, glContext) {
+ static const int kWidth = 13;
+ static const int kHeight = 13;
+
+ GrColor pixels[kWidth * kHeight];
+ for (int y = 0; y < kHeight; ++y) {
+ for (int x = 0; x < kWidth; ++x) {
+ pixels[y * kWidth + x] = y * kWidth + x;
+ }
+ }
+
+ for (int origin = 0; origin < 2; ++origin) {
+ GrGLuint rectTexID = glContext->createTextureRectangle(kWidth, kHeight, GR_GL_RGBA,
+ GR_GL_RGBA, GR_GL_UNSIGNED_BYTE,
+ pixels);
+
+ if (!rectTexID) {
+ return;
+ }
+
+ // Let GrContext know that we messed with the GL context directly.
+ context->resetContext();
+
+ // Wrap the rectangle texture ID in a GrTexture
+ GrGLTextureInfo rectangleInfo;
+ rectangleInfo.fID = rectTexID;
+ rectangleInfo.fTarget = GR_GL_TEXTURE_RECTANGLE;
+
+ GrBackendTextureDesc rectangleDesc;
+ rectangleDesc.fFlags = kRenderTarget_GrBackendTextureFlag;
+ rectangleDesc.fConfig = kRGBA_8888_GrPixelConfig;
+ rectangleDesc.fWidth = kWidth;
+ rectangleDesc.fHeight = kHeight;
+ rectangleDesc.fOrigin = origin ? kBottomLeft_GrSurfaceOrigin : kTopLeft_GrSurfaceOrigin;
+ rectangleDesc.fTextureHandle = reinterpret_cast<GrBackendObject>(&rectangleInfo);
+
+ GrColor refPixels[kWidth * kHeight];
+ bool flipRef = rectangleDesc.fOrigin == kBottomLeft_GrSurfaceOrigin;
+ for (int y = 0; y < kHeight; ++y) {
+ for (int x = 0; x < kWidth; ++x) {
+ int y0 = flipRef ? kHeight - y - 1 : y;
+ refPixels[y * kWidth + x] = pixels[y0 * kWidth + x];
+ }
+ }
+
+ SkAutoTUnref<GrTexture> rectangleTexture(
+ context->textureProvider()->wrapBackendTexture(rectangleDesc));
+ if (!rectangleTexture) {
+ ERRORF(reporter, "Error wrapping rectangle texture in GrTexture.");
+ GR_GL_CALL(glContext->gl(), DeleteTextures(1, &rectTexID));
+ continue;
+ }
+
+ test_read_pixels(reporter, context, rectangleTexture, refPixels);
+
+ test_copy_surface_src(reporter, context, rectangleTexture, refPixels);
+
+ test_copy_surface_dst(reporter, context, rectangleTexture);
+
+ test_write_pixels(reporter, context, rectangleTexture);
+
+ test_clear(reporter, context, rectangleTexture);
+
+ GR_GL_CALL(glContext->gl(), DeleteTextures(1, &rectTexID));
+ }
+}
+
+#endif