Creating functions for uploading a mipmapped texture.

src/gpu/GrGpu.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGpu.h"
@@ skipping 46 matching lines @@
     // By default, GrRenderTargets are GL's normal orientation so that they
     // can be drawn to by the outside world without the client having
     // to render upside down.
     if (kDefault_GrSurfaceOrigin == origin) {
         return renderTarget ? kBottomLeft_GrSurfaceOrigin : kTopLeft_GrSurfaceOrigin;
     } else {
         return origin;
     }
 }
 
+static bool check_texture_creation_params(const GrCaps* caps, const GrSurfaceDesc& desc,

[scroggo, 2015/07/21 14:44:23]

nit: typically we use const& for parameters which are mandatory.

More importantly, can you add comments?

[cblume, 2015/07/21 23:07:30]

Done.

+                                          bool& isRT) {

[scroggo, 2015/07/21 14:44:23]

nit: typically we use pointers for parameters which may be changed. So this
should be:

bool* isRT

[cblume, 2015/07/21 23:07:29]

Done.

+    if (!caps->isConfigTexturable(desc.fConfig)) {
+        return false;
+    }
+
+    isRT = SkToBool(desc.fFlags & kRenderTarget_GrSurfaceFlag);
+    if (isRT && !caps->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
+        return false;
+    }
+
+    // We currently not support multisampled textures
+    if (!isRT && desc.fSampleCnt > 0) {
+        return false;
+    }
+
+    if (isRT) {
+        int maxRTSize = caps->maxRenderTargetSize();
+        if (desc.fWidth > maxRTSize || desc.fHeight > maxRTSize) {
+            return false;
+        }
+    } else {
+        int maxSize = caps->maxTextureSize();
+        if (desc.fWidth > maxSize || desc.fHeight > maxSize) {
+            return false;
+        }
+    }
+    return true;
+}
+
 GrTexture* GrGpu::createTexture(const GrSurfaceDesc& origDesc, bool budgeted,
                                 const void* srcData, size_t rowBytes) {
     GrSurfaceDesc desc = origDesc;
 
-    if (!this->caps()->isConfigTexturable(desc.fConfig)) {
+    bool isRT = false;
+    bool textureCreationParamsValid = check_texture_creation_params(this->caps(), desc, isRT);
+    if (textureCreationParamsValid == false) {

[scroggo, 2015/07/21 14:44:23]

nit: typically we just say

if (!textureCreationParamsValid) {

[cblume, 2015/07/21 23:07:29]

Done.

         return NULL;
     }
 
-    bool isRT = SkToBool(desc.fFlags & kRenderTarget_GrSurfaceFlag);
-    if (isRT && !this->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
-        return NULL;
-    }
-
-    // We currently not support multisampled textures
-    if (!isRT && desc.fSampleCnt > 0) {
-        return NULL;
-    }
-
-    GrTexture *tex = NULL;
-
-    if (isRT) {
-        int maxRTSize = this->caps()->maxRenderTargetSize();
-        if (desc.fWidth > maxRTSize || desc.fHeight > maxRTSize) {
-            return NULL;
-        }
-    } else {
-        int maxSize = this->caps()->maxTextureSize();
-        if (desc.fWidth > maxSize || desc.fHeight > maxSize) {
-            return NULL;
-        }
-    }
-
-    GrGpuResource::LifeCycle lifeCycle = budgeted ? GrGpuResource::kCached_LifeCycle :
-                                                    GrGpuResource::kUncached_LifeCycle;
-
     desc.fSampleCnt = SkTMin(desc.fSampleCnt, this->caps()->maxSampleCount());
     // Attempt to catch un- or wrongly initialized sample counts;
     SkASSERT(desc.fSampleCnt >= 0 && desc.fSampleCnt <= 64);
 
     desc.fOrigin = resolve_origin(desc.fOrigin, isRT);
 
+    GrTexture *tex = NULL;
+    GrGpuResource::LifeCycle lifeCycle = budgeted ? GrGpuResource::kCached_LifeCycle :
+                                                    GrGpuResource::kUncached_LifeCycle;
+
     if (GrPixelConfigIsCompressed(desc.fConfig)) {
         // We shouldn't be rendering into this
         SkASSERT(!isRT);
         SkASSERT(0 == desc.fSampleCnt);
 
         if (!this->caps()->npotTextureTileSupport() &&
             (!SkIsPow2(desc.fWidth) || !SkIsPow2(desc.fHeight))) {
             return NULL;
         }
 
         this->handleDirtyContext();
         tex = this->onCreateCompressedTexture(desc, lifeCycle, srcData);
     } else {
         this->handleDirtyContext();
         tex = this->onCreateTexture(desc, lifeCycle, srcData, rowBytes);
     }
     if (!this->caps()->reuseScratchTextures() && !isRT) {
         tex->resourcePriv().removeScratchKey();
     }
     if (tex) {
         fStats.incTextureCreates();
         if (srcData) {
             fStats.incTextureUploads();
         }
     }
     return tex;
 }
 
+GrTexture* GrGpu::createMipmappedTexture(const GrSurfaceDesc& origDesc, bool budgeted,
+                                         const SkMipMap& srcData) {
+    GrSurfaceDesc desc = origDesc;
+
+    bool isRT = false;
+    bool textureCreationParamsValid = check_texture_creation_params(this->caps(), desc, isRT);
+    if (textureCreationParamsValid == false) {
+        return NULL;
+    }
+
+    desc.fSampleCnt = SkTMin(desc.fSampleCnt, this->caps()->maxSampleCount());
+    // Attempt to catch un- or wrongly initialized sample counts;
+    SkASSERT(desc.fSampleCnt >= 0 && desc.fSampleCnt <= 64);
+
+    desc.fOrigin = resolve_origin(desc.fOrigin, isRT);
+
+    GrTexture *tex = NULL;
+    GrGpuResource::LifeCycle lifeCycle = budgeted ? GrGpuResource::kCached_LifeCycle :
+                                                    GrGpuResource::kUncached_LifeCycle;
+
+    if (GrPixelConfigIsCompressed(desc.fConfig)) {
+        // We shouldn't be rendering into this
+        SkASSERT(!isRT);
+        SkASSERT(0 == desc.fSampleCnt);
+
+        if (!this->caps()->npotTextureTileSupport() &&
+            (!SkIsPow2(desc.fWidth) || !SkIsPow2(desc.fHeight))) {
+            return NULL;
+        }
+
+        this->handleDirtyContext();
+        tex = this->onCreateCompressedMipmappedTexture(desc, lifeCycle, srcData);
+    } else {
+        this->handleDirtyContext();
+        tex = this->onCreateMipmappedTexture(desc, lifeCycle, srcData);
+    }
+    if (!this->caps()->reuseScratchTextures() && !isRT) {
+        tex->resourcePriv().removeScratchKey();
+    }
+    if (tex) {
+        fStats.incTextureCreates();
+        fStats.incTextureUploads();
+    }
+    return tex;
+}
+
 bool GrGpu::attachStencilAttachmentToRenderTarget(GrRenderTarget* rt) {
     SkASSERT(NULL == rt->renderTargetPriv().getStencilAttachment());
     GrUniqueKey sbKey;
 
     int width = rt->width();
     int height = rt->height();
 #if 0
     if (this->caps()->oversizedStencilSupport()) {
         width  = SkNextPow2(width);
         height = SkNextPow2(height);
@@ skipping 158 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrGpu::draw(const DrawArgs& args, const GrVertices& vertices) {
     this->handleDirtyContext();
     GrVertices::Iterator iter;
     const GrNonInstancedVertices* verts = iter.init(vertices);
     do {
         this->onDraw(args, *verts);
     } while ((verts = iter.next()));
 }