add ability to get FBO ID to Surface

tests/SurfaceTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDevice.h"
@@ skipping 84 matching lines @@
     
     REPORTER_ASSERT(reporter, NULL == SkSurface::NewRaster(info));
     REPORTER_ASSERT(reporter, NULL == SkSurface::NewRasterDirect(info, NULL, 0));
     if (ctx) {
         REPORTER_ASSERT(reporter, NULL ==
                         SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted, info, 0, NULL));
     }
 }
 
 #if SK_SUPPORT_GPU
-static void test_wrapped_surface(skiatest::Reporter* reporter, GrContext* ctx) {
+static void test_wrapped_texture_surface(skiatest::Reporter* reporter, GrContext* ctx) {
     if (NULL == ctx) {
         return;
     }
 
     GrTestTarget tt;
     ctx->getTestTarget(&tt);
     if (!tt.target()) {
         SkDEBUGFAIL("Couldn't get Gr test target.");
         return;
     }
 
     // We currently have only implemented the texture uploads for GL.
     const GrGLInterface* gl = tt.glContext()->interface();
     if (!gl) {
         return;
     }
 
-    for (int useFBO = 0; useFBO < 2; ++useFBO) {
-        // Test the wrapped factory for SkSurface by creating a texture using GL and then wrap it in
-        // a SkSurface.
-        GrGLuint texID;
-        static const int kW = 100;
-        static const int kH = 100;
-        static const uint32_t kOrigColor = 0xFFAABBCC;
-        SkAutoTArray<uint32_t> pixels(kW * kH);
-        sk_memset32(pixels.get(), kOrigColor, kW * kH);
-        GR_GL_CALL(gl, GenTextures(1, &texID));
-        GR_GL_CALL(gl, ActiveTexture(GR_GL_TEXTURE0));
-        GR_GL_CALL(gl, PixelStorei(GR_GL_UNPACK_ALIGNMENT, 1));
-        GR_GL_CALL(gl, BindTexture(GR_GL_TEXTURE_2D, texID));
-        GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_MAG_FILTER,
-                                     GR_GL_NEAREST));
-        GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_MIN_FILTER,
-                                     GR_GL_NEAREST));
-        GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_WRAP_S,
-                                     GR_GL_CLAMP_TO_EDGE));
-        GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_WRAP_T,
-                                     GR_GL_CLAMP_TO_EDGE));
-        GR_GL_CALL(gl, TexImage2D(GR_GL_TEXTURE_2D, 0, GR_GL_RGBA, kW, kH, 0, GR_GL_RGBA,
-                                  GR_GL_UNSIGNED_BYTE,
-                                  pixels.get()));
+    // Test the wrapped factory for SkSurface by creating a texture using GL and then wrap it in
+    // a SkSurface.
+    GrGLuint texID;
+    static const int kW = 100;
+    static const int kH = 100;
+    static const uint32_t kOrigColor = 0xFFAABBCC;
+    SkAutoTArray<uint32_t> pixels(kW * kH);
+    sk_memset32(pixels.get(), kOrigColor, kW * kH);
+    GR_GL_CALL(gl, GenTextures(1, &texID));
+    GR_GL_CALL(gl, ActiveTexture(GR_GL_TEXTURE0));
+    GR_GL_CALL(gl, PixelStorei(GR_GL_UNPACK_ALIGNMENT, 1));
+    GR_GL_CALL(gl, BindTexture(GR_GL_TEXTURE_2D, texID));
+    GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_MAG_FILTER,
+                                 GR_GL_NEAREST));
+    GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_MIN_FILTER,
+                                 GR_GL_NEAREST));
+    GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_WRAP_S,
+                                 GR_GL_CLAMP_TO_EDGE));
+    GR_GL_CALL(gl, TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_WRAP_T,
+                                 GR_GL_CLAMP_TO_EDGE));
+    GR_GL_CALL(gl, TexImage2D(GR_GL_TEXTURE_2D, 0, GR_GL_RGBA, kW, kH, 0, GR_GL_RGBA,
+                              GR_GL_UNSIGNED_BYTE,
+                              pixels.get()));
 
-        SkAutoTUnref<SkSurface> surface;
-        GrGLuint fboID = 0;
-        if (useFBO) {
-            GR_GL_CALL(gl, GenFramebuffers(1, &fboID));
-            GR_GL_CALL(gl, BindFramebuffer(GR_GL_FRAMEBUFFER, fboID));
-            GR_GL_CALL(gl, FramebufferTexture2D(GR_GL_FRAMEBUFFER, GR_GL_COLOR_ATTACHMENT0,
-                                                GR_GL_TEXTURE_2D, texID, 0));
-            GrBackendRenderTargetDesc wrappedDesc;
-            wrappedDesc.fConfig = kRGBA_8888_GrPixelConfig;
-            wrappedDesc.fWidth = kW;
-            wrappedDesc.fHeight = kH;
-            wrappedDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
-            wrappedDesc.fSampleCnt = 0;
-            wrappedDesc.fRenderTargetHandle = fboID;
-            wrappedDesc.fStencilBits = 0;
+    GrBackendTextureDesc wrappedDesc;
+    wrappedDesc.fConfig = kRGBA_8888_GrPixelConfig;
+    wrappedDesc.fWidth = kW;
+    wrappedDesc.fHeight = kH;
+    wrappedDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
+    wrappedDesc.fSampleCnt = 0;
+    wrappedDesc.fFlags = kRenderTarget_GrBackendTextureFlag;
+    wrappedDesc.fTextureHandle = texID;
 
-            ctx->resetContext();
-            surface.reset(SkSurface::NewFromBackendRenderTarget(ctx, wrappedDesc, NULL));
-        } else {
-            GrBackendTextureDesc wrappedDesc;
-            wrappedDesc.fConfig = kRGBA_8888_GrPixelConfig;
-            wrappedDesc.fWidth = kW;
-            wrappedDesc.fHeight = kH;
-            wrappedDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
-            wrappedDesc.fSampleCnt = 0;
-            wrappedDesc.fFlags = kRenderTarget_GrBackendTextureFlag;
-            wrappedDesc.fTextureHandle = texID;
-
-            ctx->resetContext();
-            surface.reset(SkSurface::NewFromBackendTexture(ctx, wrappedDesc, NULL));
-        }
-        REPORTER_ASSERT(reporter, surface);
-        if (surface) {
-            // Validate that we can draw to the canvas and that the original texture color is
-            // preserved in pixels that aren't rendered to via the surface.
-            SkPaint paint;
-            static const SkColor kRectColor = ~kOrigColor | 0xFF000000;
-            paint.setColor(kRectColor);
-            surface->getCanvas()->drawRect(SkRect::MakeWH(SkIntToScalar(kW), SkIntToScalar(kH)/2),
-                                           paint);
-            SkImageInfo readInfo = SkImageInfo::MakeN32Premul(kW, kH);
-            surface->readPixels(readInfo, pixels.get(), kW * sizeof(uint32_t), 0, 0);
-            bool stop = false;
-            SkPMColor origColorPM = SkPackARGB32((kOrigColor >> 24 & 0xFF),
-                                                 (kOrigColor >>  0 & 0xFF),
-                                                 (kOrigColor >>  8 & 0xFF),
-                                                 (kOrigColor >> 16 & 0xFF));
-            SkPMColor rectColorPM = SkPackARGB32((kRectColor >> 24 & 0xFF),
-                                                 (kRectColor >> 16 & 0xFF),
-                                                 (kRectColor >>  8 & 0xFF),
-                                                 (kRectColor >>  0 & 0xFF));
-            for (int y = 0; y < kH/2 && !stop; ++y) {
-                for (int x = 0; x < kW && !stop; ++x) {
-                    REPORTER_ASSERT(reporter, rectColorPM == pixels[x + y * kW]);
-                    if (rectColorPM != pixels[x + y * kW]) {
-                        stop = true;
-                    }
-                }
-            }
-            stop = false;
-            for (int y = kH/2; y < kH && !stop; ++y) {
-                for (int x = 0; x < kW && !stop; ++x) {
-                    REPORTER_ASSERT(reporter, origColorPM == pixels[x + y * kW]);
-                    if (origColorPM != pixels[x + y * kW]) {
-                        stop = true;
-                    }
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewWrappedRenderTarget(ctx, wrappedDesc, NULL));
+    REPORTER_ASSERT(reporter, surface);
+    if (surface) {
+        // Validate that we can draw to the canvas and that the original texture color is preserved
+        // in pixels that aren't rendered to via the surface.
+        SkPaint paint;
+        static const SkColor kRectColor = ~kOrigColor | 0xFF000000;
+        paint.setColor(kRectColor);
+        surface->getCanvas()->drawRect(SkRect::MakeWH(SkIntToScalar(kW), SkIntToScalar(kH)/2),
+                                       paint);
+        SkImageInfo readInfo = SkImageInfo::MakeN32Premul(kW, kH);
+        surface->readPixels(readInfo, pixels.get(), kW * sizeof(uint32_t), 0, 0);
+        bool stop = false;
+        SkPMColor origColorPM = SkPackARGB32((kOrigColor >> 24 & 0xFF),
+                                             (kOrigColor >>  0 & 0xFF),
+                                             (kOrigColor >>  8 & 0xFF),
+                                             (kOrigColor >> 16 & 0xFF));
+        SkPMColor rectColorPM = SkPackARGB32((kRectColor >> 24 & 0xFF),
+                                             (kRectColor >> 16 & 0xFF),
+                                             (kRectColor >>  8 & 0xFF),
+                                             (kRectColor >>  0 & 0xFF));
+        for (int y = 0; y < kH/2 && !stop; ++y) {
+            for (int x = 0; x < kW && !stop; ++x) {
+                REPORTER_ASSERT(reporter, rectColorPM == pixels[x + y * kW]);
+                if (rectColorPM != pixels[x + y * kW]) {
+                    stop = true;
                 }
             }
         }
-        if (texID) {
-            GR_GL_CALL(gl, DeleteTextures(1, &texID));
+        stop = false;
+        for (int y = kH/2; y < kH && !stop; ++y) {
+            for (int x = 0; x < kW && !stop; ++x) {
+                REPORTER_ASSERT(reporter, origColorPM == pixels[x + y * kW]);
+                if (origColorPM != pixels[x + y * kW]) {
+                    stop = true;
+                }
+            }
         }
-        if (fboID) {
-            GR_GL_CALL(gl, DeleteFramebuffers(1, &fboID));
-        }
-
     }
 }
 #endif
 
 
 static void test_image(skiatest::Reporter* reporter) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(1, 1);
     size_t rowBytes = info.minRowBytes();
     size_t size = info.getSafeSize(rowBytes);
     SkData* data = SkData::NewUninitialized(size);
@@ skipping 26 matching lines @@
     return device->accessBitmap(false).getGenerationID();
 }
 
 /*
  *  Test legacy behavor of bumping the surface's device's bitmap's genID when we access its
  *  texture handle for writing.
  *
  *  Note: this needs to be tested separately from checking newImageSnapshot, as calling that
  *  can also incidentally bump the genID (when a new backing surface is created).
  */
-static void test_texture_handle_genID(skiatest::Reporter* reporter, SkSurface* surf) {
+template <class F>
+static void test_texture_handle_genID(skiatest::Reporter* reporter, SkSurface* surf, F f) {
     const uint32_t gen0 = get_legacy_gen_id(surf);
-    surf->getTextureHandle(SkSurface::kFlushRead_TextureHandleAccess);
+    f(surf, SkSurface::kFlushRead_BackendHandleAccess);
     const uint32_t gen1 = get_legacy_gen_id(surf);
     REPORTER_ASSERT(reporter, gen0 == gen1);
 
-    surf->getTextureHandle(SkSurface::kFlushWrite_TextureHandleAccess);
+    f(surf, SkSurface::kFlushWrite_BackendHandleAccess);
     const uint32_t gen2 = get_legacy_gen_id(surf);
     REPORTER_ASSERT(reporter, gen0 != gen2);
 
-    surf->getTextureHandle(SkSurface::kDiscardWrite_TextureHandleAccess);
+    f(surf, SkSurface::kDiscardWrite_BackendHandleAccess);
     const uint32_t gen3 = get_legacy_gen_id(surf);
     REPORTER_ASSERT(reporter, gen0 != gen3);
     REPORTER_ASSERT(reporter, gen2 != gen3);
 }
 
-static void test_texture_handle(skiatest::Reporter* reporter, SkSurface* surf) {
+template <class F>
+static void test_backend_handle(skiatest::Reporter* reporter, SkSurface* surf, F f) {
     SkAutoTUnref<SkImage> image0(surf->newImageSnapshot());
-    GrBackendObject obj = surf->getTextureHandle(SkSurface::kFlushRead_TextureHandleAccess);
+    GrBackendObject obj = f(surf, SkSurface::kFlushRead_BackendHandleAccess);
     REPORTER_ASSERT(reporter, obj != 0);
     SkAutoTUnref<SkImage> image1(surf->newImageSnapshot());
     // just read access should not affect the snapshot
     REPORTER_ASSERT(reporter, image0->uniqueID() == image1->uniqueID());
 
-    obj = surf->getTextureHandle(SkSurface::kFlushWrite_TextureHandleAccess);
+    obj = f(surf, SkSurface::kFlushWrite_BackendHandleAccess);
     REPORTER_ASSERT(reporter, obj != 0);
     SkAutoTUnref<SkImage> image2(surf->newImageSnapshot());
     // expect a new image, since we claimed we would write
     REPORTER_ASSERT(reporter, image0->uniqueID() != image2->uniqueID());
 
-    obj = surf->getTextureHandle(SkSurface::kDiscardWrite_TextureHandleAccess);
+    obj = f(surf, SkSurface::kDiscardWrite_BackendHandleAccess);
     REPORTER_ASSERT(reporter, obj != 0);
     SkAutoTUnref<SkImage> image3(surf->newImageSnapshot());
     // expect a new(er) image, since we claimed we would write
     REPORTER_ASSERT(reporter, image0->uniqueID() != image3->uniqueID());
     REPORTER_ASSERT(reporter, image2->uniqueID() != image3->uniqueID());
 }
 
 static SkImage* create_image(skiatest::Reporter* reporter,
                              ImageType imageType, GrContext* context, SkColor color,
                              ReleaseDataContext* releaseContext) {
@@ skipping 13 matching lines @@
             return SkImage::NewRasterData(info, data, rowBytes);
         case kRasterProc_ImageType:
             SkASSERT(releaseContext);
             releaseContext->fData = SkRef(data.get());
             return SkImage::NewFromRaster(info, addr, rowBytes,
                                           ReleaseDataContext::Release, releaseContext);
         case kGpu_ImageType: {
             SkAutoTUnref<SkSurface> surf(
                 SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info, 0));
             surf->getCanvas()->clear(color);
-            // test our backing texture while were here...
-            test_texture_handle_genID(reporter, surf);
-            test_texture_handle(reporter, surf);
+            // test our backing texture / rendertarget while were here...
+            auto textureAccessorFunc =
+                    [](SkSurface* surf, SkSurface::BackendHandleAccess access) -> GrBackendObject {
+                        return surf->getTextureHandle(access); };
+            auto renderTargetAccessorFunc =
+                    [](SkSurface* surf, SkSurface::BackendHandleAccess access) -> GrBackendObject {
+                        GrBackendObject obj;
+                        SkAssertResult(surf->getRenderTargetHandle(&obj, access));
+                        return obj; };
+            test_backend_handle(reporter, surf, textureAccessorFunc);
+            test_backend_handle(reporter, surf, renderTargetAccessorFunc);
+            test_texture_handle_genID(reporter, surf, textureAccessorFunc);
+            test_texture_handle_genID(reporter, surf, renderTargetAccessorFunc);
+
             // redraw so our returned image looks as expected.
             surf->getCanvas()->clear(color);
             return surf->newImageSnapshot();
         }
         case kCodec_ImageType: {
             SkBitmap bitmap;
             bitmap.installPixels(info, addr, rowBytes);
             SkAutoTUnref<SkData> src(
                  SkImageEncoder::EncodeData(bitmap, SkImageEncoder::kPNG_Type, 100));
             return SkImage::NewFromEncoded(src);
@@ skipping 529 matching lines @@
                 TestSurfaceWritableAfterSnapshotRelease(reporter, kGpu_SurfaceType, context);
                 TestSurfaceWritableAfterSnapshotRelease(reporter, kGpuScratch_SurfaceType, context);
                 TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface::kDiscard_ContentChangeMode);
                 TestSurfaceNoCanvas(reporter, kGpuScratch_SurfaceType, context, SkSurface::kDiscard_ContentChangeMode);
                 TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface::kRetain_ContentChangeMode);
                 TestSurfaceNoCanvas(reporter, kGpuScratch_SurfaceType, context, SkSurface::kRetain_ContentChangeMode);
                 TestGetTexture(reporter, kGpu_SurfaceType, context);
                 TestGetTexture(reporter, kGpuScratch_SurfaceType, context);
                 test_empty_surface(reporter, context);
                 test_surface_budget(reporter, context);
-                test_wrapped_surface(reporter, context);
+                test_wrapped_texture_surface(reporter, context);
             }
         }
     }
 #endif
 }
 
 #if SK_SUPPORT_GPU
 
 struct ReleaseTextureContext {
     ReleaseTextureContext(skiatest::Reporter* reporter) {
@@ skipping 82 matching lines @@
     // We expect the ref'd image to see the new color, but cpy'd one should still see the old color
     test_image_color(reporter, refImg, expected1);
     test_image_color(reporter, cpyImg, expected0);
 
     // Now exercise the release proc
     REPORTER_ASSERT(reporter, !releaseCtx.fIsReleased);
     refImg.reset(NULL); // force a release of the image
     REPORTER_ASSERT(reporter, releaseCtx.fIsReleased);
 }
 #endif