From 7fa5c31c2c9af834bee66d5fcf476e250076c8d6 Mon Sep 17 00:00:00 2001 From: Stan Iliev Date: Wed, 19 Apr 2017 00:23:39 +0000 Subject: Revert "Plumb GrBackendTexture throughout skia." This reverts commit 7da62b9059f3c1d31624a0e4da96ee5f908f9c12. Reason for revert: fix android roll Original change's description: > Plumb GrBackendTexture throughout skia. > > Bug: skia: > Change-Id: I1bae6768ee7229818a83ba608035a1f7867e6875 > Reviewed-on: https://skia-review.googlesource.com/13645 > Commit-Queue: Greg Daniel > Reviewed-by: Robert Phillips > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,brianosman@google.com,reviews@skia.org,stani@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I5cb8763cc837c83ebc6d10366fe2dd3efe35fb89 Reviewed-on: https://skia-review.googlesource.com/13773 Reviewed-by: Stan Iliev Commit-Queue: Stan Iliev --- tests/RectangleTextureTest.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'tests/RectangleTextureTest.cpp') diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp index 967d86c9c4..41ee7b3c1c 100644 --- a/tests/RectangleTextureTest.cpp +++ b/tests/RectangleTextureTest.cpp @@ -13,14 +13,13 @@ #include "GrContext.h" #include "GrContextPriv.h" #include "GrRenderTargetContext.h" -#include "GrTest.h" #include "gl/GLTestContext.h" #include "gl/GrGLGpu.h" #include "gl/GrGLUtil.h" // skbug.com/5932 static void test_basic_draw_as_src(skiatest::Reporter* reporter, GrContext* context, - sk_sp rectProxy, uint32_t expectedPixelValues[]) { + sk_sp rectProxy, uint32_t expectedPixelValues[]) { sk_sp rtContext( context->makeRenderTargetContext(SkBackingFit::kExact, rectProxy->width(), rectProxy->height(), rectProxy->config(), @@ -31,7 +30,7 @@ static void test_basic_draw_as_src(skiatest::Reporter* reporter, GrContext* cont rtContext->clear(nullptr, 0xDDCCBBAA, true); sk_sp fp(GrSimpleTextureEffect::Make( context->resourceProvider(), - rectProxy, + sk_ref_sp(rectProxy->asTextureProxy()), nullptr, SkMatrix::I(), filter)); GrPaint paint; @@ -100,9 +99,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(RectangleTexture, reporter, ctxInfo) { } } - for (auto origin : { kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin }) { - bool useBLOrigin = kBottomLeft_GrSurfaceOrigin == origin; - + for (int origin = 0; origin < 2; ++origin) { GrGLuint rectTexID = glContext->createTextureRectangle(kWidth, kHeight, GR_GL_RGBA, GR_GL_RGBA, GR_GL_UNSIGNED_BYTE, pixels); @@ -119,19 +116,25 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(RectangleTexture, reporter, ctxInfo) { rectangleInfo.fID = rectTexID; rectangleInfo.fTarget = GR_GL_TEXTURE_RECTANGLE; - GrBackendTexture rectangleTex(kWidth, kHeight, kRGBA_8888_GrPixelConfig, &rectangleInfo); + 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(&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 = useBLOrigin ? kHeight - y - 1 : y; + int y0 = flipRef ? kHeight - y - 1 : y; refPixels[y * kWidth + x] = pixels[y0 * kWidth + x]; } } - sk_sp rectProxy = GrSurfaceProxy::MakeWrappedBackend(context, - rectangleTex, - origin); + sk_sp rectProxy = GrSurfaceProxy::MakeWrappedBackend(context, + rectangleDesc); if (!rectProxy) { ERRORF(reporter, "Error creating proxy for rectangle texture."); GR_GL_CALL(glContext->gl(), DeleteTextures(1, &rectTexID)); -- cgit v1.2.3