add SkImage::NewFromBitmap

src/image/SkImage_Gpu.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImage_Gpu.h"
 #include "GrContext.h"
 #include "GrDrawContext.h"
@@ skipping 126 matching lines @@
 SkImage* SkImage::NewFromTexture(GrContext* ctx, const GrBackendTextureDesc& desc, SkAlphaType at,
                                  TextureReleaseProc releaseP, ReleaseContext releaseC) {
     return new_wrapped_texture_common(ctx, desc, at, kBorrow_GrWrapOwnership, releaseP, releaseC);
 }
 
 SkImage* SkImage::NewFromAdoptedTexture(GrContext* ctx, const GrBackendTextureDesc& desc,
                                         SkAlphaType at) {
     return new_wrapped_texture_common(ctx, desc, at, kAdopt_GrWrapOwnership, NULL, NULL);
 }
 
-SkImage* SkImage::NewFromTextureCopy(GrContext* ctx, const GrBackendTextureDesc& srcDesc,
+SkImage* SkImage::NewFromTextureCopy(GrContext* ctx, const GrBackendTextureDesc& desc,
                                      SkAlphaType at) {
-    const bool isBudgeted = true;
-    const SkSurface::Budgeted budgeted = SkSurface::kYes_Budgeted;
-
-    if (srcDesc.fWidth <= 0 || srcDesc.fHeight <= 0) {
+    if (desc.fWidth <= 0 || desc.fHeight <= 0) {
         return NULL;
     }
+
     SkAutoTUnref<GrTexture> src(ctx->textureProvider()->wrapBackendTexture(
-        srcDesc, kBorrow_GrWrapOwnership));
+        desc, kBorrow_GrWrapOwnership));
     if (!src) {
         return NULL;
     }
 
-    GrSurfaceDesc dstDesc;
-    // need to be a rendertarget for readpixels to work, instead of kNone_GrSurfaceFlags
-    dstDesc.fFlags = kRenderTarget_GrSurfaceFlag;
-    dstDesc.fOrigin = srcDesc.fOrigin;
-    dstDesc.fWidth = srcDesc.fWidth;
-    dstDesc.fHeight = srcDesc.fHeight;
-    dstDesc.fConfig = srcDesc.fConfig;
-    dstDesc.fSampleCnt = srcDesc.fSampleCnt;
-
-    SkAutoTUnref<GrTexture> dst(ctx->textureProvider()->createTexture(
-                                                                  dstDesc, isBudgeted, NULL, 0));
+    const bool isBudgeted = true;
+    SkAutoTUnref<GrTexture> dst(GrDeepCopyTexture(src, isBudgeted));
     if (!dst) {
         return NULL;
     }
 
-    const SkIRect srcR = SkIRect::MakeWH(dstDesc.fWidth, dstDesc.fHeight);
-    const SkIPoint dstP = SkIPoint::Make(0, 0);
-    ctx->copySurface(dst, src, srcR, dstP, GrContext::kFlushWrites_PixelOp);
-
+    const SkSurface::Budgeted budgeted = SkSurface::kYes_Budgeted;
     const int sampleCount = 0;  // todo: make this an explicit parameter to newSurface()?
-    return SkNEW_ARGS(SkImage_Gpu, (dstDesc.fWidth, dstDesc.fHeight, at, dst, sampleCount,
-                                    budgeted));
+    return SkNEW_ARGS(SkImage_Gpu, (desc.fWidth, desc.fHeight, at, dst, sampleCount, budgeted));
 }
 
 SkImage* SkImage::NewFromYUVTexturesCopy(GrContext* ctx , SkYUVColorSpace colorSpace,
                                          const GrBackendObject yuvTextureHandles[3],
                                          const SkISize yuvSizes[3],
                                          GrSurfaceOrigin origin) {
     const SkSurface::Budgeted budgeted = SkSurface::kYes_Budgeted;
 
     if (yuvSizes[0].fWidth <= 0 || yuvSizes[0].fHeight <= 0 ||
         yuvSizes[1].fWidth <= 0 || yuvSizes[1].fHeight <= 0 ||
@@ skipping 56 matching lines @@
                                                      colorSpace))->unref();
 
     const SkRect rect = SkRect::MakeWH(SkIntToScalar(dstDesc.fWidth),
                                        SkIntToScalar(dstDesc.fHeight));
     GrDrawContext* drawContext = ctx->drawContext();
     drawContext->drawRect(dst->asRenderTarget(), GrClip::WideOpen(), paint, SkMatrix::I(), rect);
     ctx->flushSurfaceWrites(dst);
     return SkNEW_ARGS(SkImage_Gpu, (dstDesc.fWidth, dstDesc.fHeight, kOpaque_SkAlphaType, dst, 0,
                                     budgeted));
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+GrTexture* GrDeepCopyTexture(GrTexture* src, bool budgeted) {
+    GrContext* ctx = src->getContext();
+
+    GrSurfaceDesc desc = src->desc();
+    // need to be a rendertarget for readpixels to work, instead of kNone_GrSurfaceFlags

[robertphillips, 2015/07/06 20:43:47]

Should the copied texture inherit the src's kCheckAllocation_GrSurfaceFlag ?

[reed2, 2015/07/07 01:18:03]

You tell me. I didn't know about that flag. What is its intent?

[robertphillips, 2015/07/07 12:23:59]

Tracing through the code it looks like this should be fine. I wonder if we can
remove the kCheckAllocation flag from the public API though.

+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
+    GrTexture* dst = ctx->textureProvider()->createTexture(desc, budgeted, NULL, 0);
+    if (!dst) {
+        return NULL;
+    }
+    
+    const SkIRect srcR = SkIRect::MakeWH(desc.fWidth, desc.fHeight);
+    const SkIPoint dstP = SkIPoint::Make(0, 0);
+    ctx->copySurface(dst, src, srcR, dstP, GrContext::kFlushWrites_PixelOp);
+    return dst;
+}
+