diff options
| author | Jason Sams <rjsams@android.com> | 2010-01-06 15:10:29 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-01-06 15:10:29 -0800 |
| commit | 74e02ef2000ff2783e526d6916e2f0b5d517593e (patch) | |
| tree | cd25a361e97f0991b8222096623b23c2e58b2775 /libs/rs | |
| parent | 5e3f6caeb08c54fb79f427a528e084711652bbdb (diff) | |
| download | frameworks_base-74e02ef2000ff2783e526d6916e2f0b5d517593e.zip frameworks_base-74e02ef2000ff2783e526d6916e2f0b5d517593e.tar.gz frameworks_base-74e02ef2000ff2783e526d6916e2f0b5d517593e.tar.bz2 | |
Support npot on es 2.0 HW.
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/java/Film/src/com/android/film/FilmRS.java | 2 | ||||
| -rw-r--r-- | libs/rs/rsAllocation.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libs/rs/java/Film/src/com/android/film/FilmRS.java b/libs/rs/java/Film/src/com/android/film/FilmRS.java index fcf487c..b80e619 100644 --- a/libs/rs/java/Film/src/com/android/film/FilmRS.java +++ b/libs/rs/java/Film/src/com/android/film/FilmRS.java @@ -156,9 +156,7 @@ public class FilmRS { mBufferIDs.length); Element ie = Element.createPixel(mRS, Element.DataType.UNSIGNED_5_6_5, Element.DataKind.PIXEL_RGB); - android.util.Log.e("rs", "load 1"); mImages[0] = Allocation.createFromBitmapResourceBoxed(mRS, mRes, R.drawable.p01, ie, true); - android.util.Log.e("rs", "load 2"); mImages[1] = Allocation.createFromBitmapResourceBoxed(mRS, mRes, R.drawable.p02, ie, true); mImages[2] = Allocation.createFromBitmapResourceBoxed(mRS, mRes, R.drawable.p03, ie, true); mImages[3] = Allocation.createFromBitmapResourceBoxed(mRS, mRes, R.drawable.p04, ie, true); diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index 19699dc..b4ec1a2 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -463,8 +463,9 @@ 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); - rsAssert(!(w & (w-1))); - rsAssert(!(h & (h-1))); + + // 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); rsi_TypeBegin(rsc, _dst); |