diff options
author | Chris Craik <ccraik@google.com> | 2015-02-23 13:07:57 -0800 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2015-02-23 13:21:53 -0800 |
commit | 8e93a7c9377b4ae43ecfb408f4906a09f6c83c03 (patch) | |
tree | 8a68ed6f0eca6f0688b9d9f07aa51d097ccc7c9b | |
parent | f27133df2d179c99d6bc1ae644af09e9153a0071 (diff) | |
download | frameworks_base-8e93a7c9377b4ae43ecfb408f4906a09f6c83c03.zip frameworks_base-8e93a7c9377b4ae43ecfb408f4906a09f6c83c03.tar.gz frameworks_base-8e93a7c9377b4ae43ecfb408f4906a09f6c83c03.tar.bz2 |
Simplify Texture member initialization
Change-Id: Iaaa6dd20e64a0a075d732b101e3c4278cad44047
-rw-r--r-- | libs/hwui/GradientCache.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/Texture.cpp | 40 | ||||
-rw-r--r-- | libs/hwui/Texture.h | 39 | ||||
-rw-r--r-- | libs/hwui/TextureCache.cpp | 6 | ||||
-rw-r--r-- | libs/hwui/tests/main.cpp | 2 |
5 files changed, 23 insertions, 66 deletions
diff --git a/libs/hwui/GradientCache.cpp b/libs/hwui/GradientCache.cpp index fb4c785..ea93e7f 100644 --- a/libs/hwui/GradientCache.cpp +++ b/libs/hwui/GradientCache.cpp @@ -166,7 +166,7 @@ Texture* GradientCache::addLinearGradient(GradientCacheEntry& gradient, GradientInfo info; getGradientInfo(colors, count, info); - Texture* texture = new Texture(); + Texture* texture = new Texture(Caches::getInstance()); texture->width = info.width; texture->height = 2; texture->blend = info.hasAlpha; diff --git a/libs/hwui/Texture.cpp b/libs/hwui/Texture.cpp index 512f5cf..593e918 100644 --- a/libs/hwui/Texture.cpp +++ b/libs/hwui/Texture.cpp @@ -24,46 +24,6 @@ namespace android { namespace uirenderer { -Texture::Texture() - : id(0) - , generation(0) - , blend(false) - , width(0) - , height(0) - , cleanup(false) - , bitmapSize(0) - , mipMap(false) - , uvMapper(nullptr) - , isInUse(false) - , mWrapS(GL_CLAMP_TO_EDGE) - , mWrapT(GL_CLAMP_TO_EDGE) - , mMinFilter(GL_NEAREST) - , mMagFilter(GL_NEAREST) - , mFirstFilter(true) - , mFirstWrap(true) - , mCaches(Caches::getInstance()) { -} - -Texture::Texture(Caches& caches) - : id(0) - , generation(0) - , blend(false) - , width(0) - , height(0) - , cleanup(false) - , bitmapSize(0) - , mipMap(false) - , uvMapper(nullptr) - , isInUse(false) - , mWrapS(GL_CLAMP_TO_EDGE) - , mWrapT(GL_CLAMP_TO_EDGE) - , mMinFilter(GL_NEAREST) - , mMagFilter(GL_NEAREST) - , mFirstFilter(true) - , mFirstWrap(true) - , mCaches(caches) { -} - void Texture::setWrapST(GLenum wrapS, GLenum wrapT, bool bindTexture, bool force, GLenum renderTarget) { diff --git a/libs/hwui/Texture.h b/libs/hwui/Texture.h index d5601f8..dfec462 100644 --- a/libs/hwui/Texture.h +++ b/libs/hwui/Texture.h @@ -30,8 +30,7 @@ class UvMapper; */ class Texture { public: - Texture(); - Texture(Caches& caches); + Texture(Caches& caches) : mCaches(caches) { } virtual ~Texture() { } @@ -59,62 +58,62 @@ public: /** * Name of the texture. */ - GLuint id; + GLuint id = 0; /** * Generation of the backing bitmap, */ - uint32_t generation; + uint32_t generation = 0; /** * Indicates whether the texture requires blending. */ - bool blend; + bool blend = false; /** * Width of the backing bitmap. */ - uint32_t width; + uint32_t width = 0; /** * Height of the backing bitmap. */ - uint32_t height; + uint32_t height = 0; /** * Indicates whether this texture should be cleaned up after use. */ - bool cleanup; + bool cleanup= false; /** * Optional, size of the original bitmap. */ - uint32_t bitmapSize; + uint32_t bitmapSize = 0; /** * Indicates whether this texture will use trilinear filtering. */ - bool mipMap; + bool mipMap = false; /** * Optional, pointer to a texture coordinates mapper. */ - const UvMapper* uvMapper; + const UvMapper* uvMapper = nullptr; /** * Whether or not the Texture is marked in use and thus not evictable for * the current frame. This is reset at the start of a new frame. */ - bool isInUse; + bool isInUse = false; private: /** - * Last wrap modes set on this texture. Defaults to GL_CLAMP_TO_EDGE. + * Last wrap modes set on this texture. */ - GLenum mWrapS; - GLenum mWrapT; + GLenum mWrapS = GL_CLAMP_TO_EDGE; + GLenum mWrapT = GL_CLAMP_TO_EDGE; /** - * Last filters set on this texture. Defaults to GL_NEAREST. + * Last filters set on this texture. */ - GLenum mMinFilter; - GLenum mMagFilter; + GLenum mMinFilter = GL_NEAREST; + GLenum mMagFilter = GL_NEAREST; - bool mFirstFilter; - bool mFirstWrap; + bool mFirstFilter = true; + bool mFirstWrap = true; Caches& mCaches; }; // struct Texture diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp index f4f8e44..b911a0f 100644 --- a/libs/hwui/TextureCache.cpp +++ b/libs/hwui/TextureCache.cpp @@ -168,7 +168,7 @@ Texture* TextureCache::getCachedTexture(const SkBitmap* bitmap) { } if (canCache) { - texture = new Texture(); + texture = new Texture(Caches::getInstance()); texture->bitmapSize = size; generateTexture(bitmap, texture, false); @@ -206,7 +206,7 @@ Texture* TextureCache::get(const SkBitmap* bitmap) { } const uint32_t size = bitmap->rowBytes() * bitmap->height(); - texture = new Texture(); + texture = new Texture(Caches::getInstance()); texture->bitmapSize = size; generateTexture(bitmap, texture, false); texture->cleanup = true; @@ -216,7 +216,7 @@ Texture* TextureCache::get(const SkBitmap* bitmap) { } Texture* TextureCache::getTransient(const SkBitmap* bitmap) { - Texture* texture = new Texture(); + Texture* texture = new Texture(Caches::getInstance()); texture->bitmapSize = bitmap->rowBytes() * bitmap->height(); texture->cleanup = true; diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp index b6d2c4d..00cc830 100644 --- a/libs/hwui/tests/main.cpp +++ b/libs/hwui/tests/main.cpp @@ -89,8 +89,6 @@ public: android::uirenderer::Rect DUMMY; - std::vector< sp<RenderNode> > cards; - DisplayListRenderer* renderer = startRecording(rootNode); animation.createContent(width, height, renderer); endRecording(renderer, rootNode); |