Merge "New bindings generated by glgen"

4 files changed, 9 insertions, 9 deletions

diff --git a/core/jni/android_opengl_GLES10.cpp b/core/jni/android_opengl_GLES10.cpp
index d8a15df5c89c..571f5790bd1e 100644
--- a/core/jni/android_opengl_GLES10.cpp
+++ b/core/jni/android_opengl_GLES10.cpp
@@ -3679,7 +3679,7 @@ android_glTexImage2D__IIIIIIIILjava_nio_Buffer_2
     if (pixels_buf) {
         pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);
     }
-    if (pixels == NULL) {
+    if (pixels_buf && pixels == NULL) {
         char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);
         pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
     }
@@ -3733,7 +3733,7 @@ android_glTexSubImage2D__IIIIIIIILjava_nio_Buffer_2
     if (pixels_buf) {
         pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);
     }
-    if (pixels == NULL) {
+    if (pixels_buf && pixels == NULL) {
         char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);
         pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
     }
diff --git a/core/jni/android_opengl_GLES11.cpp b/core/jni/android_opengl_GLES11.cpp
index dd5094046fd1..1e6ceb32b9cf 100644
--- a/core/jni/android_opengl_GLES11.cpp
+++ b/core/jni/android_opengl_GLES11.cpp
@@ -150,7 +150,7 @@ android_glBufferData__IILjava_nio_Buffer_2I
             goto exit;
         }
     }
-    if (data == NULL) {
+    if (data_buf && data == NULL) {
         char * _dataBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);
         data = (GLvoid *) (_dataBase + _bufferOffset);
     }
diff --git a/core/jni/android_opengl_GLES20.cpp b/core/jni/android_opengl_GLES20.cpp
index 0f663252b43f..c5301172f548 100644
--- a/core/jni/android_opengl_GLES20.cpp
+++ b/core/jni/android_opengl_GLES20.cpp
@@ -289,7 +289,7 @@ android_glBufferData__IILjava_nio_Buffer_2I
             goto exit;
         }
     }
-    if (data == NULL) {
+    if (data_buf && data == NULL) {
         char * _dataBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);
         data = (GLvoid *) (_dataBase + _bufferOffset);
     }
@@ -4536,7 +4536,7 @@ android_glTexImage2D__IIIIIIIILjava_nio_Buffer_2
     if (pixels_buf) {
         pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);
     }
-    if (pixels == NULL) {
+    if (pixels_buf && pixels == NULL) {
         char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);
         pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
     }
@@ -4766,7 +4766,7 @@ android_glTexSubImage2D__IIIIIIIILjava_nio_Buffer_2
     if (pixels_buf) {
         pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);
     }
-    if (pixels == NULL) {
+    if (pixels_buf && pixels == NULL) {
         char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);
         pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
     }
diff --git a/core/jni/com_google_android_gles_jni_GLImpl.cpp b/core/jni/com_google_android_gles_jni_GLImpl.cpp
index 9730c091ffbc..3f9942e68633 100644
--- a/core/jni/com_google_android_gles_jni_GLImpl.cpp
+++ b/core/jni/com_google_android_gles_jni_GLImpl.cpp
@@ -3807,7 +3807,7 @@ android_glTexImage2D__IIIIIIIILjava_nio_Buffer_2
     if (pixels_buf) {
         pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);
     }
-    if (pixels == NULL) {
+    if (pixels_buf && pixels == NULL) {
         char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);
         pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
     }
@@ -3861,7 +3861,7 @@ android_glTexSubImage2D__IIIIIIIILjava_nio_Buffer_2
     if (pixels_buf) {
         pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);
     }
-    if (pixels == NULL) {
+    if (pixels_buf && pixels == NULL) {
         char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);
         pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
     }
@@ -4108,7 +4108,7 @@ android_glBufferData__IILjava_nio_Buffer_2I
             goto exit;
         }
     }
-    if (data == NULL) {
+    if (data_buf && data == NULL) {
         char * _dataBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);
         data = (GLvoid *) (_dataBase + _bufferOffset);
     }