diff options
| author | Jason Sams <rjsams@android.com> | 2010-09-16 18:18:29 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-09-16 18:18:29 -0700 |
| commit | d081fffab58b4cb8a36b7a083ab7793585bc1510 (patch) | |
| tree | 2d4ea330edfd21499546fc0a9ae9d647d7a1ee0e /libs/rs/rsAllocation.cpp | |
| parent | a8bf9429b29743b3489817feb21bde2416acc465 (diff) | |
| download | frameworks_base-d081fffab58b4cb8a36b7a083ab7793585bc1510.zip frameworks_base-d081fffab58b4cb8a36b7a083ab7793585bc1510.tar.gz frameworks_base-d081fffab58b4cb8a36b7a083ab7793585bc1510.tar.bz2 | |
Cleanup GL setup code and remove legacy 1.1 paths.
Reset pointers to NULL when allocations are unbound.
Change-Id: Ifaba634ecbb154970b7fb47faa8e6475d16d2f66
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
| -rw-r--r-- | libs/rs/rsAllocation.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index 60998c3..87c4f2b 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -724,10 +724,7 @@ RsAllocation rsi_AllocationCreateFromBitmap(Context *rsc, uint32_t w, uint32_t h const Element *src = static_cast<const Element *>(_src); const Element *dst = static_cast<const Element *>(_dst); - // Check for pow2 on pre es 2.0 versions. - rsAssert(rsc->checkVersion2_0() || (!(w & (w-1)) && !(h & (h-1)))); - - //LOGE("rsi_AllocationCreateFromBitmap %i %i %i %i %i", w, h, dstFmt, srcFmt, genMips); + //LOGE("%p rsi_AllocationCreateFromBitmap %i %i %i", rsc, w, h, genMips); rsi_TypeBegin(rsc, _dst); rsi_TypeAdd(rsc, RS_DIMENSION_X, w); rsi_TypeAdd(rsc, RS_DIMENSION_Y, h); |