diff options
author | Jason Sams <rjsams@android.com> | 2009-11-24 12:53:32 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-24 12:53:32 -0800 |
commit | e4df64bdaaf86fb7d06715de122a97d723d7fea2 (patch) | |
tree | 6b8bc8c6b5da6985d58de5031957d9fec22379f5 /libs/rs/rsAllocation.h | |
parent | b867594323f430d83e4b51279c79d1f057b70267 (diff) | |
parent | 66358e24a6bbc2017c2edd921a64e616b4c9cac4 (diff) | |
download | frameworks_base-e4df64bdaaf86fb7d06715de122a97d723d7fea2.zip frameworks_base-e4df64bdaaf86fb7d06715de122a97d723d7fea2.tar.gz frameworks_base-e4df64bdaaf86fb7d06715de122a97d723d7fea2.tar.bz2 |
am 66358e24: am 9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4' into eclair-mr2-plus-aosp
* commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4':
Force a crash under conditions where white square bug in all apps is likely to occur.
Diffstat (limited to 'libs/rs/rsAllocation.h')
-rw-r--r-- | libs/rs/rsAllocation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/rsAllocation.h b/libs/rs/rsAllocation.h index 514b1c2..f54284a 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 uploadToTexture(uint32_t lodOffset = 0); + void uploadToTexture(Context *rsc, uint32_t lodOffset = 0); uint32_t getTextureID() const {return mTextureID;} void uploadToBufferObject(); |