Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(917)

Unified Diff: src/gpu/GrTextureProvider.cpp

Issue 1249543003: Creating functions for uploading a mipmapped texture. (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: Removing the concept of a dirty mipmap. It is expected that the texture upload provides the mipmaps. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/gpu/GrTextureProvider.cpp
diff --git a/src/gpu/GrTextureProvider.cpp b/src/gpu/GrTextureProvider.cpp
index 26384abbd2ad5bcd93ca65203631035a16d18334..79700fa8b9ce722a4125ddb1b271e5ccddf4c3ed 100644
--- a/src/gpu/GrTextureProvider.cpp
+++ b/src/gpu/GrTextureProvider.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2015 Google Inc.
*
@@ -18,7 +17,7 @@ enum ScratchTextureFlags {
};
GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budgeted,
- const void* srcData, size_t rowBytes) {
+ const SkTArray<SkMipMapLevel>& texels) {
if (this->isAbandoned()) {
return nullptr;
}
@@ -30,8 +29,8 @@ GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budg
static const uint32_t kFlags = kExact_ScratchTextureFlag |
kNoCreate_ScratchTextureFlag;
if (GrTexture* texture = this->refScratchTexture(desc, kFlags)) {
- if (!srcData || texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
- srcData, rowBytes)) {
+ if (texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
+ texels)) {
if (!budgeted) {
texture->resourcePriv().makeUnbudgeted();
}
@@ -40,7 +39,16 @@ GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budg
texture->unref();
}
}
- return fGpu->createTexture(desc, budgeted, srcData, rowBytes);
+ return fGpu->createTexture(desc, budgeted, texels);
+}
+
+GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budgeted,
+ const void* srcData, size_t rowBytes) {
+ SkMipMapLevel level(srcData, rowBytes);
+ const int mipLevelCount = 1;
+ SkTArray<SkMipMapLevel> texels(mipLevelCount);
+ texels.push_back(level);
+ return this->createTexture(desc, budgeted, texels);
}
GrTexture* GrTextureProvider::createApproxTexture(const GrSurfaceDesc& desc) {

Powered by Google App Engine
This is Rietveld 408576698