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

Merge "New bindings generated by glgen"

Browse Source
This commit is contained in:
Mathias Agopian
2012-07-23 17:59:47 -07:00
committed by Android (Google) Code Review
parent eba77803dc 37c9b49ab5
commit 4530a50a7b
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_opengl_GLES10.cpp
View File

@@ -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);
}

2
core/jni/android_opengl_GLES11.cpp
View File

@@ -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);
}

6
core/jni/android_opengl_GLES20.cpp
View File

@@ -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);
}

6
core/jni/com_google_android_gles_jni_GLImpl.cpp
View File

@@ -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);
}