summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsAllocation.h
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-03-01 15:42:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-01 15:42:03 -0800
commit1549257d12d8c134c0671ae56981e2e40d471d05 (patch)
treea08580ec71bf4b1ff73c8cdf028466e366649115 /libs/rs/rsAllocation.h
parent053100e6b6fdb57dbea98f7adff48fd07455c00b (diff)
parentc2908e60c9b021fb4bb69acff8d49981dd4dade8 (diff)
downloadframeworks_base-1549257d12d8c134c0671ae56981e2e40d471d05.zip
frameworks_base-1549257d12d8c134c0671ae56981e2e40d471d05.tar.gz
frameworks_base-1549257d12d8c134c0671ae56981e2e40d471d05.tar.bz2
Merge "Support defered generation of mipmaps. With this change we support mipmap generation when the texture is uploaded to GL without requiring RS to retain the full chain."
Diffstat (limited to 'libs/rs/rsAllocation.h')
-rw-r--r--libs/rs/rsAllocation.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/rs/rsAllocation.h b/libs/rs/rsAllocation.h
index f0b2122..778c904 100644
--- a/libs/rs/rsAllocation.h
+++ b/libs/rs/rsAllocation.h
@@ -46,7 +46,7 @@ public:
void * getPtr() const {return mPtr;}
const Type * getType() const {return mType.get();}
- void deferedUploadToTexture(const Context *rsc, uint32_t lodOffset);
+ void deferedUploadToTexture(const Context *rsc, bool genMipmap, uint32_t lodOffset);
void uploadToTexture(const Context *rsc);
uint32_t getTextureID() const {return mTextureID;}
@@ -98,6 +98,7 @@ protected:
// Is this a legal structure to be used as a texture source.
// Initially this will require 1D or 2D and color data
bool mIsTexture;
+ bool mTextureGenMipmap;
uint32_t mTextureLOD;
uint32_t mTextureID;