diff options
| author | Jason Sams <rjsams@android.com> | 2010-06-22 17:45:34 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-06-22 17:45:34 -0700 |
| commit | 0ebd5690b8a9eb55dc940b670267c11600cf7380 (patch) | |
| tree | 2444e3e7750b2bd24432193c69846b6ac20c8584 /libs/rs/rsAllocation.cpp | |
| parent | 7c1f4c38a2d3a972f7dc6f508d3318c11ec539c7 (diff) | |
| download | frameworks_base-0ebd5690b8a9eb55dc940b670267c11600cf7380.zip frameworks_base-0ebd5690b8a9eb55dc940b670267c11600cf7380.tar.gz frameworks_base-0ebd5690b8a9eb55dc940b670267c11600cf7380.tar.bz2 | |
Fix 32&24 ->16 bit bitmap uploads.
Change-Id: If8c52dd8ff34393c2908516e702a2d5daeb7bbb3
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
| -rw-r--r-- | libs/rs/rsAllocation.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index 289cb30..d9d0bc5 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -559,7 +559,7 @@ static ElementConverter_t pickConverter(const Element *dst, const Element *src) if (srcGLType == GL_UNSIGNED_BYTE && srcGLFmt == GL_RGB && dstGLType == GL_UNSIGNED_SHORT_5_6_5 && - dstGLType == GL_RGB) { + dstGLFmt == GL_RGB) { return elementConverter_888_to_565; } @@ -567,12 +567,16 @@ static ElementConverter_t pickConverter(const Element *dst, const Element *src) if (srcGLType == GL_UNSIGNED_BYTE && srcGLFmt == GL_RGBA && dstGLType == GL_UNSIGNED_SHORT_5_6_5 && - dstGLType == GL_RGB) { + dstGLFmt == GL_RGB) { return elementConverter_8888_to_565; } LOGE("pickConverter, unsuported combo, src %p, dst %p", src, dst); + LOGE("pickConverter, srcGLType = %x, srcGLFmt = %x", srcGLType, srcGLFmt); + LOGE("pickConverter, dstGLType = %x, dstGLFmt = %x", dstGLType, dstGLFmt); + src->dumpLOGV("SRC "); + dst->dumpLOGV("DST "); return 0; } |