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

Merge "Add glReadPixels with buffer-offset argument" into nyc-dev

Browse Source
This commit is contained in:
Pablo Ceballos
2016-02-25 18:54:17 +00:00
committed by Android (Google) Code Review
parent 58d3f97002 68981ff03b
commit 0f61ae26ce
5 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -26889,6 +26889,7 @@ package android.opengl {
method public static void glProgramBinary(int, int, java.nio.Buffer, int); method public static void glProgramBinary(int, int, java.nio.Buffer, int);
method public static void glProgramParameteri(int, int, int); method public static void glProgramParameteri(int, int, int);
method public static void glReadBuffer(int); method public static void glReadBuffer(int);
method public static void glReadPixels(int, int, int, int, int, int, int);
method public static void glRenderbufferStorageMultisample(int, int, int, int, int); method public static void glRenderbufferStorageMultisample(int, int, int, int, int);
method public static void glResumeTransformFeedback(); method public static void glResumeTransformFeedback();
method public static void glSamplerParameterf(int, int, float); method public static void glSamplerParameterf(int, int, float);

1
api/system-current.txt
View File

@@ -29189,6 +29189,7 @@ package android.opengl {
method public static void glProgramBinary(int, int, java.nio.Buffer, int); method public static void glProgramBinary(int, int, java.nio.Buffer, int);
method public static void glProgramParameteri(int, int, int); method public static void glProgramParameteri(int, int, int);
method public static void glReadBuffer(int); method public static void glReadBuffer(int);
method public static void glReadPixels(int, int, int, int, int, int, int);
method public static void glRenderbufferStorageMultisample(int, int, int, int, int); method public static void glRenderbufferStorageMultisample(int, int, int, int, int);
method public static void glResumeTransformFeedback(); method public static void glResumeTransformFeedback();
method public static void glSamplerParameterf(int, int, float); method public static void glSamplerParameterf(int, int, float);

1
api/test-current.txt
View File

@@ -26898,6 +26898,7 @@ package android.opengl {
method public static void glProgramBinary(int, int, java.nio.Buffer, int); method public static void glProgramBinary(int, int, java.nio.Buffer, int);
method public static void glProgramParameteri(int, int, int); method public static void glProgramParameteri(int, int, int);
method public static void glReadBuffer(int); method public static void glReadBuffer(int);
method public static void glReadPixels(int, int, int, int, int, int, int);
method public static void glRenderbufferStorageMultisample(int, int, int, int, int); method public static void glRenderbufferStorageMultisample(int, int, int, int, int);
method public static void glResumeTransformFeedback(); method public static void glResumeTransformFeedback();
method public static void glSamplerParameterf(int, int, float); method public static void glSamplerParameterf(int, int, float);

16
core/jni/android_opengl_GLES30.cpp
View File

@@ -5155,6 +5155,21 @@ android_glGetInternalformativ__IIIILjava_nio_IntBuffer_2
} }
} }
/* void glReadPixels ( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint offset ) */
static void
android_glReadPixels__IIIIIII
(JNIEnv *_env, jobject _this, jint x, jint y, jint width, jint height, jint format, jint type, jint offset) {
glReadPixels(
(GLint)x,
(GLint)y,
(GLsizei)width,
(GLsizei)height,
(GLenum)format,
(GLenum)type,
reinterpret_cast<GLvoid *>(offset)
);
}
static const char *classPathName = "android/opengl/GLES30"; static const char *classPathName = "android/opengl/GLES30";
static const JNINativeMethod methods[] = { static const JNINativeMethod methods[] = {
@@ -5320,6 +5335,7 @@ static const JNINativeMethod methods[] = {
{"glTexStorage3D", "(IIIIII)V", (void *) android_glTexStorage3D__IIIIII }, {"glTexStorage3D", "(IIIIII)V", (void *) android_glTexStorage3D__IIIIII },
{"glGetInternalformativ", "(IIII[II)V", (void *) android_glGetInternalformativ__IIII_3II }, {"glGetInternalformativ", "(IIII[II)V", (void *) android_glGetInternalformativ__IIII_3II },
{"glGetInternalformativ", "(IIIILjava/nio/IntBuffer;)V", (void *) android_glGetInternalformativ__IIIILjava_nio_IntBuffer_2 }, {"glGetInternalformativ", "(IIIILjava/nio/IntBuffer;)V", (void *) android_glGetInternalformativ__IIIILjava_nio_IntBuffer_2 },
{"glReadPixels", "(IIIIIII)V", (void *) android_glReadPixels__IIIIIII },
}; };
int register_android_opengl_jni_GLES30(JNIEnv *_env) int register_android_opengl_jni_GLES30(JNIEnv *_env)

12
opengl/java/android/opengl/GLES30.java
View File

@@ -1791,4 +1791,16 @@ public class GLES30 extends GLES20 {
java.nio.IntBuffer params java.nio.IntBuffer params
); );
// C function void glReadPixels ( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint offset )
public static native void glReadPixels(
int x,
int y,
int width,
int height,
int format,
int type,
int offset
);
} }