Merge "New bindings generated by glgen" (4530a50a) · Commits · e / os / android_frameworks_base

core/jni/android_opengl_GLES10.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3679,7 +3679,7 @@ android_glTexImage2D__IIIIIIIILjava_nio_Buffer_2
	if (pixels_buf) {		if (pixels_buf) {
	pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);		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);		char * _pixelsBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);
	pixels = (GLvoid *) (_pixelsBase + _bufferOffset);		pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
	}		}
	@@ -3733,7 +3733,7 @@ android_glTexSubImage2D__IIIIIIIILjava_nio_Buffer_2
	if (pixels_buf) {		if (pixels_buf) {
	pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);		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);		char * _pixelsBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);
	pixels = (GLvoid *) (_pixelsBase + _bufferOffset);		pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
	}		}

core/jni/android_opengl_GLES11.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -150,7 +150,7 @@ android_glBufferData__IILjava_nio_Buffer_2I
	goto exit;		goto exit;
	}		}
	}		}
	if (data == NULL) {		if (data_buf && data == NULL) {
	char * _dataBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);		char * _dataBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);
	data = (GLvoid *) (_dataBase + _bufferOffset);		data = (GLvoid *) (_dataBase + _bufferOffset);
	}		}

core/jni/android_opengl_GLES20.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -289,7 +289,7 @@ android_glBufferData__IILjava_nio_Buffer_2I
	goto exit;		goto exit;
	}		}
	}		}
	if (data == NULL) {		if (data_buf && data == NULL) {
	char * _dataBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);		char * _dataBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);
	data = (GLvoid *) (_dataBase + _bufferOffset);		data = (GLvoid *) (_dataBase + _bufferOffset);
	}		}
	@@ -4536,7 +4536,7 @@ android_glTexImage2D__IIIIIIIILjava_nio_Buffer_2
	if (pixels_buf) {		if (pixels_buf) {
	pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);		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);		char * _pixelsBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);
	pixels = (GLvoid *) (_pixelsBase + _bufferOffset);		pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
	}		}
	@@ -4766,7 +4766,7 @@ android_glTexSubImage2D__IIIIIIIILjava_nio_Buffer_2
	if (pixels_buf) {		if (pixels_buf) {
	pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);		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);		char * _pixelsBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);
	pixels = (GLvoid *) (_pixelsBase + _bufferOffset);		pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
	}		}

core/jni/com_google_android_gles_jni_GLImpl.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3807,7 +3807,7 @@ android_glTexImage2D__IIIIIIIILjava_nio_Buffer_2
	if (pixels_buf) {		if (pixels_buf) {
	pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);		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);		char * _pixelsBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);
	pixels = (GLvoid *) (_pixelsBase + _bufferOffset);		pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
	}		}
	@@ -3861,7 +3861,7 @@ android_glTexSubImage2D__IIIIIIIILjava_nio_Buffer_2
	if (pixels_buf) {		if (pixels_buf) {
	pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);		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);		char * _pixelsBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);
	pixels = (GLvoid *) (_pixelsBase + _bufferOffset);		pixels = (GLvoid *) (_pixelsBase + _bufferOffset);
	}		}
	@@ -4108,7 +4108,7 @@ android_glBufferData__IILjava_nio_Buffer_2I
	goto exit;		goto exit;
	}		}
	}		}
	if (data == NULL) {		if (data_buf && data == NULL) {
	char * _dataBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);		char * _dataBase = (char )_env->GetPrimitiveArrayCritical(_array, (jboolean ) 0);
	data = (GLvoid *) (_dataBase + _bufferOffset);		data = (GLvoid *) (_dataBase + _bufferOffset);
	}		}