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

Commit 0d1ab1db authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "regenerate egl/gles stubs from glgen"

parents bd0dc13c 89be00bc

core/jni/android_opengl_EGL14.cpp

+4 −5
Original line number Diff line number Diff line 
/*

**

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");
@@ -605,7 +604,7 @@ android_eglCreateWindowSurfaceTexture 
    jint _remaining;

    EGLint *attrib_list = (EGLint *) 0;

    android::sp<ANativeWindow> window;

    android::sp<android::GLConsumer> surfaceTexture;

    android::sp<android::GLConsumer> glConsumer;



    if (!attrib_list_ref) {

        _exception = 1;
@@ -626,12 +625,12 @@ not_valid_surface: 
        _exceptionMessage = "Make sure the SurfaceView or associated SurfaceHolder has a valid Surface";

        goto exit;

    }

    surfaceTexture = android::SurfaceTexture_getSurfaceTexture(_env, win);

    glConsumer = android::SurfaceTexture_getSurfaceTexture(_env, win);



    if (surfaceTexture == NULL)

    if (glConsumer == NULL)

        goto not_valid_surface;



    window = new android::Surface(surfaceTexture->getBufferQueue());

    window = new android::Surface(glConsumer->getBufferQueue());



    if (window == NULL)

        goto not_valid_surface;

core/jni/android_opengl_GLES20.cpp

+4 −4
Original line number Diff line number Diff line
@@ -2127,14 +2127,14 @@ android_glGetAttachedShaders__IILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2 
    }

}



/* int glGetAttribLocation ( GLuint program, const char *name ) */

/* GLint glGetAttribLocation ( GLuint program, const char *name ) */

static jint

android_glGetAttribLocation__ILjava_lang_String_2

  (JNIEnv *_env, jobject _this, jint program, jstring name) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    int _returnValue = 0;

    GLint _returnValue = 0;

    const char* _nativename = 0;



    if (!name) {
@@ -3983,14 +3983,14 @@ android_glGetUniformiv__IILjava_nio_IntBuffer_2 
    }

}



/* int glGetUniformLocation ( GLuint program, const char *name ) */

/* GLint glGetUniformLocation ( GLuint program, const char *name ) */

static jint

android_glGetUniformLocation__ILjava_lang_String_2

  (JNIEnv *_env, jobject _this, jint program, jstring name) {

    jint _exception = 0;

    const char * _exceptionType;

    const char * _exceptionMessage;

    int _returnValue = 0;

    GLint _returnValue = 0;

    const char* _nativename = 0;



    if (!name) {

opengl/java/android/opengl/GLES20.java

+2 −2
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ public class GLES20 { 
        java.nio.IntBuffer shaders

    );



    // C function int glGetAttribLocation ( GLuint program, const char *name )

    // C function GLint glGetAttribLocation ( GLuint program, const char *name )



    public static native int glGetAttribLocation(

        int program,
@@ -1236,7 +1236,7 @@ public class GLES20 { 
        java.nio.IntBuffer params

    );



    // C function int glGetUniformLocation ( GLuint program, const char *name )

    // C function GLint glGetUniformLocation ( GLuint program, const char *name )



    public static native int glGetUniformLocation(

        int program,