commit 0f396991929a8f6f9e5c9179578aa615a82b11c2
author Brian Salomon <bsalomon@google.com> Fri Jun 19 19:51:21 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jun 22 16:13:04 2020 +0000
tree 8f3a3579970c68c99ab39e86b042f552335b2014
parent 05ca1f606673cf4b25a3af8c1ce89082d21cf236

Reland "Make it easier to test rectangle textures by using createBackendTexture."

This is a reland of 4e37751693a793505b0070eb8121fba99247d098

Original change's description:
> Make it easier to test rectangle textures by using createBackendTexture.
> 
> Also allows internal creation of rectangle textures, only used by unit
> tests currently.
> 
> Previously GrContext::createBackendTexture() would ignore the request
> for RECTANGLE or EXTERNAL and always make 2D. Now it makes RECTANGLE if
> supported and always fails for EXTERNAL.
> 
> Change-Id: Iafbb3f5acddb37bfb8d39740f2590177a07dae78
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297472
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>

Change-Id: Ibf6921c97278c9f0f71c46883cfbaa04f229affa
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297865
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tests/TextureBindingsResetTest.cpp

diff --git a/tests/TextureBindingsResetTest.cpp b/tests/TextureBindingsResetTest.cpp
index cfcff66..d0f4c5a 100644
--- a/tests/TextureBindingsResetTest.cpp
+++ b/tests/TextureBindingsResetTest.cpp
@@ -135,18 +135,11 @@
     }
 
     if (supportRectangle) {
-        GrGLuint id = ctxInfo.glContext()->createTextureRectangle(10, 10, GR_GL_RGBA, GR_GL_RGBA,
-                                                                  GR_GL_UNSIGNED_BYTE, nullptr);
-        // Above texture creation will have messed with GL state and bindings.
-        resetBindings();
-        context->resetContext();
-        if (id) {
-            GrGLTextureInfo info;
-            info.fTarget = GR_GL_TEXTURE_RECTANGLE;
-            info.fFormat = GR_GL_RGBA8;
-            info.fID = id;
-            GrBackendTexture backendTexture(10, 10, GrMipMapped::kNo, info);
-            img = SkImage::MakeFromTexture(context, backendTexture, kTopLeft_GrSurfaceOrigin,
+        auto format = GrBackendFormat::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_RECTANGLE);
+        GrBackendTexture rectangleTexture =
+                context->createBackendTexture(10, 10, format, GrMipMapped::kNo, GrRenderable::kNo);
+        if (rectangleTexture.isValid()) {
+            img = SkImage::MakeFromTexture(context, rectangleTexture, kTopLeft_GrSurfaceOrigin,
                                            kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr);
             REPORTER_ASSERT(reporter, img);
             surf->getCanvas()->drawImage(img, 0, 0);
@@ -155,8 +148,7 @@
             context->resetGLTextureBindings();
             checkBindings();
             resetBindings();
-            GL(DeleteTextures(1, &id));
-            context->resetContext();
+            context->deleteBackendTexture(rectangleTexture);
         }
     }