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

Commit a81f54b5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add missing GLES 3.x metadata"

parents b902a835 dc43a6c9

core/jni/android_opengl_GLES10.cpp

+13 −0
Original line number Original line Diff line number Diff line
@@ -272,6 +272,19 @@ getDirectBufferPointer(JNIEnv *_env, jobject buffer) { 
 */

 */

static int getNeededCount(GLint pname) {

static int getNeededCount(GLint pname) {

    int needed = 1;

    int needed = 1;

#ifdef GL_ES_VERSION_3_0

    // GLES 3.x pnames

    switch (pname) {

        case GL_MAX_VIEWPORT_DIMS:

            needed = 2;

            break;



        case GL_PROGRAM_BINARY_FORMATS:

            glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &needed);

            break;

    }

#endif



#ifdef GL_ES_VERSION_2_0

#ifdef GL_ES_VERSION_2_0

    // GLES 2.x pnames

    // GLES 2.x pnames

    switch (pname) {

    switch (pname) {

core/jni/android_opengl_GLES10Ext.cpp

+13 −0
Original line number Original line Diff line number Diff line
@@ -272,6 +272,19 @@ getDirectBufferPointer(JNIEnv *_env, jobject buffer) { 
 */

 */

static int getNeededCount(GLint pname) {

static int getNeededCount(GLint pname) {

    int needed = 1;

    int needed = 1;

#ifdef GL_ES_VERSION_3_0

    // GLES 3.x pnames

    switch (pname) {

        case GL_MAX_VIEWPORT_DIMS:

            needed = 2;

            break;



        case GL_PROGRAM_BINARY_FORMATS:

            glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &needed);

            break;

    }

#endif



#ifdef GL_ES_VERSION_2_0

#ifdef GL_ES_VERSION_2_0

    // GLES 2.x pnames

    // GLES 2.x pnames

    switch (pname) {

    switch (pname) {

core/jni/android_opengl_GLES11.cpp

+13 −0
Original line number Original line Diff line number Diff line
@@ -272,6 +272,19 @@ getDirectBufferPointer(JNIEnv *_env, jobject buffer) { 
 */

 */

static int getNeededCount(GLint pname) {

static int getNeededCount(GLint pname) {

    int needed = 1;

    int needed = 1;

#ifdef GL_ES_VERSION_3_0

    // GLES 3.x pnames

    switch (pname) {

        case GL_MAX_VIEWPORT_DIMS:

            needed = 2;

            break;



        case GL_PROGRAM_BINARY_FORMATS:

            glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &needed);

            break;

    }

#endif



#ifdef GL_ES_VERSION_2_0

#ifdef GL_ES_VERSION_2_0

    // GLES 2.x pnames

    // GLES 2.x pnames

    switch (pname) {

    switch (pname) {

core/jni/android_opengl_GLES11Ext.cpp

+13 −0
Original line number Original line Diff line number Diff line
@@ -272,6 +272,19 @@ getDirectBufferPointer(JNIEnv *_env, jobject buffer) { 
 */

 */

static int getNeededCount(GLint pname) {

static int getNeededCount(GLint pname) {

    int needed = 1;

    int needed = 1;

#ifdef GL_ES_VERSION_3_0

    // GLES 3.x pnames

    switch (pname) {

        case GL_MAX_VIEWPORT_DIMS:

            needed = 2;

            break;



        case GL_PROGRAM_BINARY_FORMATS:

            glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &needed);

            break;

    }

#endif



#ifdef GL_ES_VERSION_2_0

#ifdef GL_ES_VERSION_2_0

    // GLES 2.x pnames

    // GLES 2.x pnames

    switch (pname) {

    switch (pname) {

core/jni/android_opengl_GLES20.cpp

+13 −0
Original line number Original line Diff line number Diff line
@@ -272,6 +272,19 @@ getDirectBufferPointer(JNIEnv *_env, jobject buffer) { 
 */

 */

static int getNeededCount(GLint pname) {

static int getNeededCount(GLint pname) {

    int needed = 1;

    int needed = 1;

#ifdef GL_ES_VERSION_3_0

    // GLES 3.x pnames

    switch (pname) {

        case GL_MAX_VIEWPORT_DIMS:

            needed = 2;

            break;



        case GL_PROGRAM_BINARY_FORMATS:

            glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &needed);

            break;

    }

#endif



#ifdef GL_ES_VERSION_2_0

#ifdef GL_ES_VERSION_2_0

    // GLES 2.x pnames

    // GLES 2.x pnames

    switch (pname) {

    switch (pname) {