Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "oth/jni/dead-statics"

Browse Source 
* changes:
  Remove unused static variables
  Remove unnecessary field lookups in getPointer
This commit is contained in:
Orion Hodson
2019-02-25 17:48:52 +00:00
committed by Android (Google) Code Review
parent 869f5c42a0 475468490d
commit 69aa9d635c
13 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_opengl_EGL14.cpp
View File

@@ -35,8 +35,6 @@
#include <ui/ANativeObjectBase.h>
static int initialized = 0;
static jclass egldisplayClass;
static jclass eglcontextClass;
static jclass eglsurfaceClass;

4
core/jni/android_opengl_EGL15.cpp
View File

@@ -27,8 +27,6 @@
#include <ui/ANativeObjectBase.h>
static int initialized = 0;
// classes from EGL 1.4
static jclass egldisplayClass;
static jclass eglsurfaceClass;
@@ -171,8 +169,6 @@ getPointer(JNIEnv *_env, jobject buffer, jarray *array, jint *remaining, jint *o
*array = NULL;
return reinterpret_cast<void*>(pointer);
}
eglimageGetHandleID = _env->GetMethodID(eglimageClass, "getNativeHandle", "()J");
eglsyncGetHandleID = _env->GetMethodID(eglsyncClass, "getNativeHandle", "()J");
*array = (jarray) _env->CallStaticObjectMethod(nioAccessClass,
getBaseArrayID, buffer);

2
core/jni/android_opengl_EGLExt.cpp
View File

@@ -36,8 +36,6 @@
#include <ui/ANativeObjectBase.h>
static int initialized = 0;
static jclass egldisplayClass;
static jclass eglcontextClass;
static jclass eglsurfaceClass;

2
core/jni/android_opengl_GLES10.cpp
View File

@@ -29,8 +29,6 @@
#include <utils/misc.h>
#include <assert.h>
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jmethodID getBasePointerID;

2
core/jni/android_opengl_GLES10Ext.cpp
View File

@@ -29,8 +29,6 @@
#include <utils/misc.h>
#include <assert.h>
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jmethodID getBasePointerID;

2
core/jni/android_opengl_GLES11.cpp
View File

@@ -29,8 +29,6 @@
#include <utils/misc.h>
#include <assert.h>
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jmethodID getBasePointerID;

2
core/jni/android_opengl_GLES11Ext.cpp
View File

@@ -29,8 +29,6 @@
#include <utils/misc.h>
#include <assert.h>
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jmethodID getBasePointerID;

2
core/jni/android_opengl_GLES20.cpp
View File

@@ -29,8 +29,6 @@
#include <utils/misc.h>
#include <assert.h>
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jmethodID getBasePointerID;

2
core/jni/android_opengl_GLES30.cpp
View File

@@ -29,8 +29,6 @@
#include <utils/misc.h>
#include <assert.h>
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jmethodID getBasePointerID;

2
core/jni/android_opengl_GLES31.cpp
View File

@@ -27,8 +27,6 @@
#include <utils/misc.h>
#include <assert.h>
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jmethodID getBasePointerID;

2
core/jni/android_opengl_GLES31Ext.cpp
View File

@@ -28,8 +28,6 @@
#include <utils/misc.h>
#include <assert.h>
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jmethodID getBasePointerID;

2
core/jni/android_opengl_GLES32.cpp
View File

@@ -27,8 +27,6 @@
#include <utils/misc.h>
#include <assert.h>
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jmethodID getBasePointerID;

2
core/jni/com_google_android_gles_jni_GLImpl.cpp
View File

@@ -65,8 +65,6 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type,
GLsizei stride, const GLvoid *pointer, GLsizei count);
}
static int initialized = 0;
static jclass nioAccessClass;
static jclass bufferClass;
static jclass G11ImplClass;