Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d7b907a authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Support npot on es 2.0 HW."

parents 0caa13b2 74e02ef2

graphics/java/android/renderscript/Allocation.java

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public class Allocation extends BaseObj { 
        return new Allocation(id, rs, null);

    }



    static public Allocation createFromBitmapBoxed(RenderScript rs, Bitmap b, Element dstFmt, boolean genMips)

    static Allocation createFromBitmapBoxed(RenderScript rs, Bitmap b, Element dstFmt, boolean genMips)

        throws IllegalArgumentException {



        rs.validate();

libs/rs/java/Film/src/com/android/film/FilmRS.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

libs/rs/rsAllocation.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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);