Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15284dee authored by Mathias Agopian's avatar Mathias Agopian
Browse files

regenerate GLES java bindings 

    - added most missing validation checks
    - glGet* validation reimplement from khronos documentation

    Bug: 7402895

Change-Id: I92a805bb1aba1600d3372dc2db22eab08c975d7f
parent 88a1cf84

core/jni/android_opengl_EGL14.cpp

+18 −18
Original line number Diff line number Diff line
@@ -155,8 +155,8 @@ static jboolean 
android_eglInitialize

  (JNIEnv *_env, jobject _this, jobject dpy, jintArray major_ref, jint majorOffset, jintArray minor_ref, jint minorOffset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    EGLBoolean _returnValue = (EGLBoolean) 0;

    EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);

    EGLint *major_base = (EGLint *) 0;
@@ -261,8 +261,8 @@ static jboolean 
android_eglGetConfigs

  (JNIEnv *_env, jobject _this, jobject dpy, jobjectArray configs_ref, jint configsOffset, jint config_size, jintArray num_config_ref, jint num_configOffset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    EGLBoolean _returnValue = (EGLBoolean) 0;

    EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);

    jint _configsRemaining;
@@ -339,8 +339,8 @@ static jboolean 
android_eglChooseConfig

  (JNIEnv *_env, jobject _this, jobject dpy, jintArray attrib_list_ref, jint attrib_listOffset, jobjectArray configs_ref, jint configsOffset, jint config_size, jintArray num_config_ref, jint num_configOffset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    EGLBoolean _returnValue = (EGLBoolean) 0;

    EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);

    bool attrib_list_sentinel = false;
@@ -462,8 +462,8 @@ static jboolean 
android_eglGetConfigAttrib

  (JNIEnv *_env, jobject _this, jobject dpy, jobject config, jint attribute, jintArray value_ref, jint offset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    EGLBoolean _returnValue = (EGLBoolean) 0;

    EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);

    EGLConfig config_native = (EGLConfig) fromEGLHandle(_env, eglconfigGetHandleID, config);
@@ -675,8 +675,8 @@ static jobject 
android_eglCreatePbufferSurface

  (JNIEnv *_env, jobject _this, jobject dpy, jobject config, jintArray attrib_list_ref, jint offset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    EGLSurface _returnValue = (EGLSurface) 0;

    EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);

    EGLConfig config_native = (EGLConfig) fromEGLHandle(_env, eglconfigGetHandleID, config);
@@ -761,8 +761,8 @@ static jboolean 
android_eglQuerySurface

  (JNIEnv *_env, jobject _this, jobject dpy, jobject surface, jint attribute, jintArray value_ref, jint offset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    EGLBoolean _returnValue = (EGLBoolean) 0;

    EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);

    EGLSurface surface_native = (EGLSurface) fromEGLHandle(_env, eglsurfaceGetHandleID, surface);
@@ -854,8 +854,8 @@ static jobject 
android_eglCreatePbufferFromClientBuffer

  (JNIEnv *_env, jobject _this, jobject dpy, jint buftype, jint buffer, jobject config, jintArray attrib_list_ref, jint offset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    EGLSurface _returnValue = (EGLSurface) 0;

    EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);

    EGLConfig config_native = (EGLConfig) fromEGLHandle(_env, eglconfigGetHandleID, config);
@@ -981,8 +981,8 @@ static jobject 
android_eglCreateContext

  (JNIEnv *_env, jobject _this, jobject dpy, jobject config, jobject share_context, jintArray attrib_list_ref, jint offset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    EGLContext _returnValue = (EGLContext) 0;

    EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);

    EGLConfig config_native = (EGLConfig) fromEGLHandle(_env, eglconfigGetHandleID, config);
@@ -1108,8 +1108,8 @@ static jboolean 
android_eglQueryContext

  (JNIEnv *_env, jobject _this, jobject dpy, jobject ctx, jint attribute, jintArray value_ref, jint offset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    EGLBoolean _returnValue = (EGLBoolean) 0;

    EGLDisplay dpy_native = (EGLDisplay) fromEGLHandle(_env, egldisplayGetHandleID, dpy);

    EGLContext ctx_native = (EGLContext) fromEGLHandle(_env, eglcontextGetHandleID, ctx);

core/jni/android_opengl_GLES10.cpp

+287 −1042

File changed.

Preview size limit exceeded, changes collapsed.

core/jni/android_opengl_GLES10Ext.cpp

+229 −10
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ 


// This source file is automatically generated



#include <GLES/gl.h>

#include <GLES/glext.h>



#include "jni.h"

#include "JNIHelp.h"

#include <android_runtime/AndroidRuntime.h>

#include <utils/misc.h>



#include <assert.h>

#include <GLES/gl.h>

#include <GLES/glext.h>



static int initialized = 0;
@@ -37,6 +37,34 @@ static jfieldID positionID; 
static jfieldID limitID;

static jfieldID elementSizeShiftID;





/* special calls implemented in Android's GLES wrapper used to more

 * efficiently bound-check passed arrays */

extern "C" {

#ifdef GL_VERSION_ES_CM_1_1

GL_API void GL_APIENTRY glColorPointerBounds(GLint size, GLenum type, GLsizei stride,

        const GLvoid *ptr, GLsizei count);

GL_API void GL_APIENTRY glNormalPointerBounds(GLenum type, GLsizei stride,

        const GLvoid *pointer, GLsizei count);

GL_API void GL_APIENTRY glTexCoordPointerBounds(GLint size, GLenum type,

        GLsizei stride, const GLvoid *pointer, GLsizei count);

GL_API void GL_APIENTRY glVertexPointerBounds(GLint size, GLenum type,

        GLsizei stride, const GLvoid *pointer, GLsizei count);

GL_API void GL_APIENTRY glPointSizePointerOESBounds(GLenum type,

        GLsizei stride, const GLvoid *pointer, GLsizei count);

GL_API void GL_APIENTRY glMatrixIndexPointerOESBounds(GLint size, GLenum type,

        GLsizei stride, const GLvoid *pointer, GLsizei count);

GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type,

        GLsizei stride, const GLvoid *pointer, GLsizei count);

#endif

#ifdef GL_ES_VERSION_2_0

static void glVertexAttribPointerBounds(GLuint indx, GLint size, GLenum type,

        GLboolean normalized, GLsizei stride, const GLvoid *pointer, GLsizei count) {

    glVertexAttribPointer(indx, size, type, normalized, stride, pointer);

}

#endif

}



/* Cache method IDs each time the class is loaded. */



static void
@@ -61,7 +89,6 @@ nativeClassInit(JNIEnv *_env, jclass glImplClass) 
        _env->GetFieldID(bufferClass, "_elementSizeShift", "I");

}





static void *

getPointer(JNIEnv *_env, jobject buffer, jarray *array, jint *remaining, jint *offset)

{
@@ -89,7 +116,6 @@ getPointer(JNIEnv *_env, jobject buffer, jarray *array, jint *remaining, jint *o 
    return NULL;

}





static void

releasePointer(JNIEnv *_env, jarray array, void *data, jboolean commit)

{
@@ -97,14 +123,207 @@ releasePointer(JNIEnv *_env, jarray array, void *data, jboolean commit) 
                       commit ? 0 : JNI_ABORT);

}



static void *

getDirectBufferPointer(JNIEnv *_env, jobject buffer) {

    char* buf = (char*) _env->GetDirectBufferAddress(buffer);

    if (buf) {

        jint position = _env->GetIntField(buffer, positionID);

        jint elementSizeShift = _env->GetIntField(buffer, elementSizeShiftID);

        buf += position << elementSizeShift;

    } else {

        jniThrowException(_env, "java/lang/IllegalArgumentException",

                          "Must use a native order direct Buffer");

    }

    return (void*) buf;

}



// --------------------------------------------------------------------------



/*

 * returns the number of values glGet returns for a given pname.

 *

 * The code below is written such that pnames requiring only one values

 * are the default (and are not explicitely tested for). This makes the

 * checking code much shorter/readable/efficient.

 *

 * This means that unknown pnames (e.g.: extensions) will default to 1. If

 * that unknown pname needs more than 1 value, then the validation check

 * is incomplete and the app may crash if it passed the wrong number params.

 */

static int getNeededCount(GLint pname) {

    int needed = 1;

#ifdef GL_ES_VERSION_2_0

    // GLES 2.x pnames

    switch (pname) {

        case GL_ALIASED_LINE_WIDTH_RANGE:

        case GL_ALIASED_POINT_SIZE_RANGE:

            needed = 2;

            break;



        case GL_BLEND_COLOR:

        case GL_COLOR_CLEAR_VALUE:

        case GL_COLOR_WRITEMASK:

        case GL_SCISSOR_BOX:

        case GL_VIEWPORT:

            needed = 4;

            break;



        case GL_COMPRESSED_TEXTURE_FORMATS:

            glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &needed);

            break;



        case GL_SHADER_BINARY_FORMATS:

            glGetIntegerv(GL_NUM_SHADER_BINARY_FORMATS, &needed);

            break;

    }

#endif



#ifdef GL_VERSION_ES_CM_1_1

    // GLES 1.x pnames

    switch (pname) {

        case GL_ALIASED_LINE_WIDTH_RANGE:

        case GL_ALIASED_POINT_SIZE_RANGE:

        case GL_DEPTH_RANGE:

        case GL_SMOOTH_LINE_WIDTH_RANGE:

        case GL_SMOOTH_POINT_SIZE_RANGE:

            needed = 2;

            break;



        case GL_CURRENT_NORMAL:

        case GL_POINT_DISTANCE_ATTENUATION:

            needed = 3;

            break;



        case GL_COLOR_CLEAR_VALUE:

        case GL_COLOR_WRITEMASK:

        case GL_CURRENT_COLOR:

        case GL_CURRENT_TEXTURE_COORDS:

        case GL_FOG_COLOR:

        case GL_LIGHT_MODEL_AMBIENT:

        case GL_SCISSOR_BOX:

        case GL_VIEWPORT:

            needed = 4;

            break;



        case GL_MODELVIEW_MATRIX:

        case GL_PROJECTION_MATRIX:

        case GL_TEXTURE_MATRIX:

            needed = 16;

            break;



        case GL_COMPRESSED_TEXTURE_FORMATS:

            glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &needed);

            break;

    }

#endif

    return needed;

}



template <typename JTYPEARRAY, typename CTYPE, void GET(GLenum, CTYPE*)>

static void

get

  (JNIEnv *_env, jobject _this, jint pname, JTYPEARRAY params_ref, jint offset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    CTYPE *params_base = (CTYPE *) 0;

    jint _remaining;

    CTYPE *params = (CTYPE *) 0;

    int _needed = 0;



    if (!params_ref) {

        _exception = 1;

        _exceptionType = "java/lang/IllegalArgumentException";

        _exceptionMessage = "params == null";

        goto exit;

    }

    if (offset < 0) {

        _exception = 1;

        _exceptionType = "java/lang/IllegalArgumentException";

        _exceptionMessage = "offset < 0";

        goto exit;

    }

    _remaining = _env->GetArrayLength(params_ref) - offset;

    _needed = getNeededCount(pname);

    // if we didn't find this pname, we just assume the user passed

    // an array of the right size -- this might happen with extensions

    // or if we forget an enum here.

    if (_remaining < _needed) {

        _exception = 1;

        _exceptionType = "java/lang/IllegalArgumentException";

        _exceptionMessage = "length - offset < needed";

        goto exit;

    }

    params_base = (CTYPE *)

        _env->GetPrimitiveArrayCritical(params_ref, (jboolean *)0);

    params = params_base + offset;



    GET(

        (GLenum)pname,

        (CTYPE *)params

    );



exit:

    if (params_base) {

        _env->ReleasePrimitiveArrayCritical(params_ref, params_base,

            _exception ? JNI_ABORT: 0);

    }

    if (_exception) {

        jniThrowException(_env, _exceptionType, _exceptionMessage);

    }

}





template <typename CTYPE, void GET(GLenum, CTYPE*)>

static void

getarray

  (JNIEnv *_env, jobject _this, jint pname, jobject params_buf) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    jarray _array = (jarray) 0;

    jint _bufferOffset = (jint) 0;

    jint _remaining;

    CTYPE *params = (CTYPE *) 0;

    int _needed = 0;



    params = (CTYPE *)getPointer(_env, params_buf, &_array, &_remaining, &_bufferOffset);

    _needed = getNeededCount(pname);

    // if we didn't find this pname, we just assume the user passed

    // an array of the right size -- this might happen with extensions

    // or if we forget an enum here.

    if (_needed>0 && _remaining < _needed) {

        _exception = 1;

        _exceptionType = "java/lang/IllegalArgumentException";

        _exceptionMessage = "remaining() < needed";

        goto exit;

    }

    if (params == NULL) {

        char * _paramsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        params = (CTYPE *) (_paramsBase + _bufferOffset);

    }

    GET(

        (GLenum)pname,

        (CTYPE *)params

    );



exit:

    if (_array) {

        releasePointer(_env, _array, params, _exception ? JNI_FALSE : JNI_TRUE);

    }

    if (_exception) {

        jniThrowException(_env, _exceptionType, _exceptionMessage);

    }

}



// --------------------------------------------------------------------------

/* GLbitfield glQueryMatrixxOES ( GLfixed *mantissa, GLint *exponent ) */

static jint

android_glQueryMatrixxOES___3II_3II

  (JNIEnv *_env, jobject _this, jintArray mantissa_ref, jint mantissaOffset, jintArray exponent_ref, jint exponentOffset) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    GLbitfield _returnValue = -1;

    GLfixed *mantissa_base = (GLfixed *) 0;

    jint _mantissaRemaining;
@@ -184,8 +403,8 @@ static jint 
android_glQueryMatrixxOES__Ljava_nio_IntBuffer_2Ljava_nio_IntBuffer_2

  (JNIEnv *_env, jobject _this, jobject mantissa_buf, jobject exponent_buf) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    const char * _exceptionType = NULL;

    const char * _exceptionMessage = NULL;

    jarray _mantissaArray = (jarray) 0;

    jint _mantissaBufferOffset = (jint) 0;

    jarray _exponentArray = (jarray) 0;

core/jni/android_opengl_GLES11.cpp

+369 −413

File changed.

Preview size limit exceeded, changes collapsed.

core/jni/android_opengl_GLES11Ext.cpp

+305 −107

File changed.

Preview size limit exceeded, changes collapsed.