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

Commit 33a608a0 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code" 

* commit '578d4f5f':
  AArch64: Use long for pointers in RS Java/JNI code
parents ffc641dd 578d4f5f

rs/java/android/renderscript/BaseObj.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ public class BaseObj { 
        mDestroyed = false;

        mDestroyed = false;

    }

    }





    void setID(int id) {

    void setID(long id) {

        if (mID != 0) {

        if (mID != 0) {

            throw new RSRuntimeException("Internal Error, reset of object ID.");

            throw new RSRuntimeException("Internal Error, reset of object ID.");

        }

        }

rs/java/android/renderscript/FileA3D.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -141,7 +141,7 @@ public class FileA3D extends BaseObj { 
                return null;

                return null;

            }

            }





            int objectID = rs.nFileA3DGetEntryByIndex(entry.mID, entry.mIndex);

            long objectID = rs.nFileA3DGetEntryByIndex(entry.mID, entry.mIndex);

            if(objectID == 0) {

            if(objectID == 0) {

                return null;

                return null;

            }

            }
@@ -297,7 +297,7 @@ public class FileA3D extends BaseObj { 




        long fileId = 0;

        long fileId = 0;

        if (is instanceof AssetManager.AssetInputStream) {

        if (is instanceof AssetManager.AssetInputStream) {

            int asset = ((AssetManager.AssetInputStream) is).getAssetInt();

            long asset = ((AssetManager.AssetInputStream) is).getNativeAsset();

            fileId = rs.nFileA3DCreateFromAssetStream(asset);

            fileId = rs.nFileA3DCreateFromAssetStream(asset);

        } else {

        } else {

            throw new RSRuntimeException("Unsupported asset stream");

            throw new RSRuntimeException("Unsupported asset stream");

rs/java/android/renderscript/Font.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ public class Font extends BaseObj { 
        return "DroidSans.ttf";

        return "DroidSans.ttf";

    }

    }





    Font(int id, RenderScript rs) {

    Font(long id, RenderScript rs) {

        super(id, rs);

        super(id, rs);

    }

    }
@@ -162,7 +162,7 @@ public class Font extends BaseObj { 
    static public Font createFromFile(RenderScript rs, Resources res, String path, float pointSize) {

    static public Font createFromFile(RenderScript rs, Resources res, String path, float pointSize) {

        rs.validate();

        rs.validate();

        int dpi = res.getDisplayMetrics().densityDpi;

        int dpi = res.getDisplayMetrics().densityDpi;

        int fontId = rs.nFontCreateFromFile(path, pointSize, dpi);

        long fontId = rs.nFontCreateFromFile(path, pointSize, dpi);





        if(fontId == 0) {

        if(fontId == 0) {

            throw new RSRuntimeException("Unable to create font from file " + path);

            throw new RSRuntimeException("Unable to create font from file " + path);
@@ -187,7 +187,7 @@ public class Font extends BaseObj { 
        AssetManager mgr = res.getAssets();

        AssetManager mgr = res.getAssets();

        int dpi = res.getDisplayMetrics().densityDpi;

        int dpi = res.getDisplayMetrics().densityDpi;





        int fontId = rs.nFontCreateFromAsset(mgr, path, pointSize, dpi);

        long fontId = rs.nFontCreateFromAsset(mgr, path, pointSize, dpi);

        if(fontId == 0) {

        if(fontId == 0) {

            throw new RSRuntimeException("Unable to create font from asset " + path);

            throw new RSRuntimeException("Unable to create font from asset " + path);

        }

        }
@@ -211,9 +211,9 @@ public class Font extends BaseObj { 




        int dpi = res.getDisplayMetrics().densityDpi;

        int dpi = res.getDisplayMetrics().densityDpi;





        int fontId = 0;

        long fontId = 0;

        if (is instanceof AssetManager.AssetInputStream) {

        if (is instanceof AssetManager.AssetInputStream) {

            int asset = ((AssetManager.AssetInputStream) is).getAssetInt();

            long asset = ((AssetManager.AssetInputStream) is).getNativeAsset();

            fontId = rs.nFontCreateFromAssetStream(name, pointSize, dpi, asset);

            fontId = rs.nFontCreateFromAssetStream(name, pointSize, dpi, asset);

        } else {

        } else {

            throw new RSRuntimeException("Unsupported asset stream created");

            throw new RSRuntimeException("Unsupported asset stream created");

rs/java/android/renderscript/ProgramStore.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -146,7 +146,7 @@ public class ProgramStore extends BaseObj { 
    BlendDstFunc mBlendDst;

    BlendDstFunc mBlendDst;

    boolean mDither;

    boolean mDither;





    ProgramStore(int id, RenderScript rs) {

    ProgramStore(long id, RenderScript rs) {

        super(id, rs);

        super(id, rs);

    }

    }
@@ -421,7 +421,7 @@ public class ProgramStore extends BaseObj { 
        */

        */

        public ProgramStore create() {

        public ProgramStore create() {

            mRS.validate();

            mRS.validate();

            int id = mRS.nProgramStoreCreate(mColorMaskR, mColorMaskG, mColorMaskB, mColorMaskA,

            long id = mRS.nProgramStoreCreate(mColorMaskR, mColorMaskG, mColorMaskB, mColorMaskA,

                                             mDepthMask, mDither,

                                             mDepthMask, mDither,

                                             mBlendSrc.mID, mBlendDst.mID, mDepthFunc.mID);

                                             mBlendSrc.mID, mBlendDst.mID, mDepthFunc.mID);

            ProgramStore programStore = new ProgramStore(id, mRS);

            ProgramStore programStore = new ProgramStore(id, mRS);

rs/java/android/renderscript/RenderScript.java

+18 −18
Original line number Original line Diff line number Diff line
@@ -506,8 +506,8 @@ public class RenderScript { 
        rsnAllocationResize1D(mContext, id, dimX);

        rsnAllocationResize1D(mContext, id, dimX);

    }

    }





    native long rsnFileA3DCreateFromAssetStream(long con, int assetStream);

    native long rsnFileA3DCreateFromAssetStream(long con, long assetStream);

    synchronized long nFileA3DCreateFromAssetStream(int assetStream) {

    synchronized long nFileA3DCreateFromAssetStream(long assetStream) {

        validate();

        validate();

        return rsnFileA3DCreateFromAssetStream(mContext, assetStream);

        return rsnFileA3DCreateFromAssetStream(mContext, assetStream);

    }

    }
@@ -531,24 +531,24 @@ public class RenderScript { 
        validate();

        validate();

        rsnFileA3DGetIndexEntries(mContext, fileA3D, numEntries, IDs, names);

        rsnFileA3DGetIndexEntries(mContext, fileA3D, numEntries, IDs, names);

    }

    }

    native int  rsnFileA3DGetEntryByIndex(long con, long fileA3D, int index);

    native long rsnFileA3DGetEntryByIndex(long con, long fileA3D, int index);

    synchronized int nFileA3DGetEntryByIndex(long fileA3D, int index) {

    synchronized long nFileA3DGetEntryByIndex(long fileA3D, int index) {

        validate();

        validate();

        return rsnFileA3DGetEntryByIndex(mContext, fileA3D, index);

        return rsnFileA3DGetEntryByIndex(mContext, fileA3D, index);

    }

    }





    native int  rsnFontCreateFromFile(long con, String fileName, float size, int dpi);

    native long rsnFontCreateFromFile(long con, String fileName, float size, int dpi);

    synchronized int nFontCreateFromFile(String fileName, float size, int dpi) {

    synchronized long nFontCreateFromFile(String fileName, float size, int dpi) {

        validate();

        validate();

        return rsnFontCreateFromFile(mContext, fileName, size, dpi);

        return rsnFontCreateFromFile(mContext, fileName, size, dpi);

    }

    }

    native int  rsnFontCreateFromAssetStream(long con, String name, float size, int dpi, int assetStream);

    native long rsnFontCreateFromAssetStream(long con, String name, float size, int dpi, long assetStream);

    synchronized int nFontCreateFromAssetStream(String name, float size, int dpi, int assetStream) {

    synchronized long nFontCreateFromAssetStream(String name, float size, int dpi, long assetStream) {

        validate();

        validate();

        return rsnFontCreateFromAssetStream(mContext, name, size, dpi, assetStream);

        return rsnFontCreateFromAssetStream(mContext, name, size, dpi, assetStream);

    }

    }

    native int  rsnFontCreateFromAsset(long con, AssetManager mgr, String path, float size, int dpi);

    native long rsnFontCreateFromAsset(long con, AssetManager mgr, String path, float size, int dpi);

    synchronized int nFontCreateFromAsset(AssetManager mgr, String path, float size, int dpi) {

    synchronized long nFontCreateFromAsset(AssetManager mgr, String path, float size, int dpi) {

        validate();

        validate();

        return rsnFontCreateFromAsset(mContext, mgr, path, size, dpi);

        return rsnFontCreateFromAsset(mContext, mgr, path, size, dpi);

    }

    }
@@ -665,9 +665,9 @@ public class RenderScript { 
        rsnScriptSetVarObj(mContext, id, slot, val);

        rsnScriptSetVarObj(mContext, id, slot, val);

    }

    }





    native int  rsnScriptCCreate(long con, String resName, String cacheDir,

    native long rsnScriptCCreate(long con, String resName, String cacheDir,

                                 byte[] script, int length);

                                 byte[] script, int length);

    synchronized int nScriptCCreate(String resName, String cacheDir, byte[] script, int length) {

    synchronized long nScriptCCreate(String resName, String cacheDir, byte[] script, int length) {

        validate();

        validate();

        return rsnScriptCCreate(mContext, resName, cacheDir, script, length);

        return rsnScriptCCreate(mContext, resName, cacheDir, script, length);

    }

    }
@@ -714,18 +714,18 @@ public class RenderScript { 
        rsnScriptGroupExecute(mContext, group);

        rsnScriptGroupExecute(mContext, group);

    }

    }





    native int  rsnSamplerCreate(long con, int magFilter, int minFilter,

    native long  rsnSamplerCreate(long con, int magFilter, int minFilter,

                                 int wrapS, int wrapT, int wrapR, float aniso);

                                 int wrapS, int wrapT, int wrapR, float aniso);

    synchronized int nSamplerCreate(int magFilter, int minFilter,

    synchronized long nSamplerCreate(int magFilter, int minFilter,

                                 int wrapS, int wrapT, int wrapR, float aniso) {

                                 int wrapS, int wrapT, int wrapR, float aniso) {

        validate();

        validate();

        return rsnSamplerCreate(mContext, magFilter, minFilter, wrapS, wrapT, wrapR, aniso);

        return rsnSamplerCreate(mContext, magFilter, minFilter, wrapS, wrapT, wrapR, aniso);

    }

    }





    native int  rsnProgramStoreCreate(long con, boolean r, boolean g, boolean b, boolean a,

    native long rsnProgramStoreCreate(long con, boolean r, boolean g, boolean b, boolean a,

                                      boolean depthMask, boolean dither,

                                      boolean depthMask, boolean dither,

                                      int srcMode, int dstMode, int depthFunc);

                                      int srcMode, int dstMode, int depthFunc);

    synchronized int nProgramStoreCreate(boolean r, boolean g, boolean b, boolean a,

    synchronized long nProgramStoreCreate(boolean r, boolean g, boolean b, boolean a,

                                         boolean depthMask, boolean dither,

                                         boolean depthMask, boolean dither,

                                         int srcMode, int dstMode, int depthFunc) {

                                         int srcMode, int dstMode, int depthFunc) {

        validate();

        validate();
@@ -791,8 +791,8 @@ public class RenderScript { 
        rsnMeshGetIndices(mContext, id, idxIds, primitives, vtxIdCount);

        rsnMeshGetIndices(mContext, id, idxIds, primitives, vtxIdCount);

    }

    }





    native long rsnPathCreate(long con, int prim, boolean isStatic, long vtx, int loop, float q);

    native long rsnPathCreate(long con, int prim, boolean isStatic, long vtx, long loop, float q);

    synchronized long nPathCreate(int prim, boolean isStatic, long vtx, int loop, float q) {

    synchronized long nPathCreate(int prim, boolean isStatic, long vtx, long loop, float q) {

        validate();

        validate();

        return rsnPathCreate(mContext, prim, isStatic, vtx, loop, q);

        return rsnPathCreate(mContext, prim, isStatic, vtx, loop, q);

    }

    }