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

Commit 8c8daea2 authored by Yang Ni's avatar Yang Ni
Browse files

Revert "Set flags in RS JNI calls for rsObj creation" 

This reverts commit ad880558.

Change-Id: I53a3f59022e2607216f4dd89bc2e28e0bd987785
parent ad880558

rs/jni/android_renderscript_RenderScript.cpp

+7 −7
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ nElementCreate(JNIEnv *_env, jobject _this, jlong con, jlong type, jint kind, jb 
              type, kind, norm, size);

    }

    return (jlong)(uintptr_t)rsElementCreate((RsContext)con, (RsDataType)type, (RsDataKind)kind,

                                             norm, size, true);

                                             norm, size);

}



static jlong
@@ -1100,7 +1100,7 @@ nElementCreate2(JNIEnv *_env, jobject _this, jlong con, 
    jlong id = (jlong)(uintptr_t)rsElementCreate2((RsContext)con,

                                     (const RsElement *)ids, fieldCount,

                                     nameArray, fieldCount * sizeof(size_t),  sizeArray,

                                     (const uint32_t *)arraySizes, fieldCount, true);

                                     (const uint32_t *)arraySizes, fieldCount);



    free(ids);

    free(arraySizes);
@@ -1174,7 +1174,7 @@ nTypeCreate(JNIEnv *_env, jobject _this, jlong con, jlong eid, 
    }



    return (jlong)(uintptr_t)rsTypeCreate((RsContext)con, (RsElement)eid, dimx, dimy, dimz, mips,

                                          faces, yuv, true);

                                          faces, yuv);

}



static void
@@ -1210,7 +1210,7 @@ nAllocationCreateTyped(JNIEnv *_env, jobject _this, jlong con, jlong type, jint 
    }

    return (jlong)(uintptr_t) rsAllocationCreateTyped((RsContext)con, (RsType)type,

                                                      (RsAllocationMipmapControl)mips,

                                                      (uint32_t)usage, (uintptr_t)pointer, true);

                                                      (uint32_t)usage, (uintptr_t)pointer);

}



static void
@@ -1315,7 +1315,7 @@ nAllocationCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong type, 
    const void* ptr = bitmap.getPixels();

    jlong id = (jlong)(uintptr_t)rsAllocationCreateFromBitmap((RsContext)con,

                                                  (RsType)type, (RsAllocationMipmapControl)mip,

                                                  ptr, bitmap.getSize(), usage, true);

                                                  ptr, bitmap.getSize(), usage);

    bitmap.unlockPixels();

    return id;

}
@@ -1331,7 +1331,7 @@ nAllocationCreateBitmapBackedAllocation(JNIEnv *_env, jobject _this, jlong con, 
    const void* ptr = bitmap.getPixels();

    jlong id = (jlong)(uintptr_t)rsAllocationCreateTyped((RsContext)con,

                                            (RsType)type, (RsAllocationMipmapControl)mip,

                                            (uint32_t)usage, (uintptr_t)ptr, true);

                                            (uint32_t)usage, (uintptr_t)ptr);

    bitmap.unlockPixels();

    return id;

}
@@ -1347,7 +1347,7 @@ nAllocationCubeCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong ty 
    const void* ptr = bitmap.getPixels();

    jlong id = (jlong)(uintptr_t)rsAllocationCubeCreateFromBitmap((RsContext)con,

                                                      (RsType)type, (RsAllocationMipmapControl)mip,

                                                      ptr, bitmap.getSize(), usage, true);

                                                      ptr, bitmap.getSize(), usage);

    bitmap.unlockPixels();

    return id;

}