diff options
| author | Jason Sams <rjsams@android.com> | 2009-11-05 16:00:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-05 16:00:56 -0800 |
| commit | 237d247cc4ad8b80388aff6ade4fdc3801452293 (patch) | |
| tree | 8f32295d7ad033a5b9f2fcedecad853a787ab777 | |
| parent | 899ebdf3bf2ff349c91f6509369724bb3abc5941 (diff) | |
| parent | 4909b554782c1970bce11fb421b0a06664a25718 (diff) | |
| download | frameworks_base-237d247cc4ad8b80388aff6ade4fdc3801452293.zip frameworks_base-237d247cc4ad8b80388aff6ade4fdc3801452293.tar.gz frameworks_base-237d247cc4ad8b80388aff6ade4fdc3801452293.tar.bz2 | |
am 4909b554: am a8f2c2b4: am 902051df: Merge change I0e27b5ca into eclair
Merge commit '4909b554782c1970bce11fb421b0a06664a25718'
* commit '4909b554782c1970bce11fb421b0a06664a25718':
Fix texture upload bug for narrow texture of less than 32bpp.
| -rw-r--r-- | libs/rs/rsAllocation.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index 6605ea9..7f4cf38 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -104,6 +104,7 @@ void Allocation::uploadToTexture(uint32_t lodOffset) glGenTextures(1, &mTextureID); } glBindTexture(GL_TEXTURE_2D, mTextureID); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); Adapter2D adapt(getContext(), this); for(uint32_t lod = 0; (lod + lodOffset) < mType->getLODCount(); lod++) { |