diff options
| author | Jason Sams <rjsams@android.com> | 2009-11-24 12:57:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-24 12:57:57 -0800 |
| commit | 0a2e7a39632cb5e98b1e9ae593609bbdda829dc2 (patch) | |
| tree | d79893c80cf6190f31ff800fa7a7587cc100026f /libs/rs/rsAllocation.h | |
| parent | 5bb9771ec74b6e8db7136c1b10aefececcb33719 (diff) | |
| parent | e4df64bdaaf86fb7d06715de122a97d723d7fea2 (diff) | |
| download | frameworks_base-0a2e7a39632cb5e98b1e9ae593609bbdda829dc2.zip frameworks_base-0a2e7a39632cb5e98b1e9ae593609bbdda829dc2.tar.gz frameworks_base-0a2e7a39632cb5e98b1e9ae593609bbdda829dc2.tar.bz2 | |
am e4df64bd: am 66358e24: am 9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit 'e4df64bdaaf86fb7d06715de122a97d723d7fea2'
* commit 'e4df64bdaaf86fb7d06715de122a97d723d7fea2':
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 ac2edf8..490abcf 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(); |