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

Commit c05246ae authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread 

Merge commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69' into gingerbread-plus-aosp

* commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69':
  surfaceflinger / GL extensions cleanup
parents 11bed4a7 888db4d6

opengl/include/GLES/glext.h

+8 −5
Original line number Diff line number Diff line
@@ -211,9 +211,12 @@ typedef void* GLeglImageOES; 
#define GL_VERTEX_ARRAY_BINDING_OES                             0x85B5

#endif



/* GL_OES_texture_external */

#ifndef GL_TEXTURE_EXTERNAL_OES

/* GL_OES_EGL_image_external */

#ifndef GL_OES_EGL_image_external

#define GL_TEXTURE_EXTERNAL_OES                                 0x8D65

#define GL_SAMPLER_EXTERNAL_OES                                 0x8D66

#define GL_TEXTURE_BINDING_EXTERNAL_OES                         0x8D67

#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES                     0x8D68

#endif



/*------------------------------------------------------------------------*
@@ -782,9 +785,9 @@ typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arra 
typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array);

#endif



/* GL_OES_texture_external */

#ifndef GL_OES_texture_external

#define GL_OES_texture_external 1

/* GL_OES_EGL_image_external */

#ifndef GL_OES_EGL_image_external

#define GL_OES_EGL_image_external 1

#endif



/*------------------------------------------------------------------------*

opengl/include/GLES2/gl2ext.h

+8 −5
Original line number Diff line number Diff line
@@ -146,9 +146,12 @@ typedef void* GLeglImageOES; 
#define GL_INT_10_10_10_2_OES                                   0x8DF7

#endif



/* GL_OES_texture_external */

#ifndef GL_TEXTURE_EXTERNAL_OES

/* GL_OES_EGL_image_external */

#ifndef GL_OES_EGL_image_external

#define GL_TEXTURE_EXTERNAL_OES                                 0x8D65

#define GL_SAMPLER_EXTERNAL_OES                                 0x8D66

#define GL_TEXTURE_BINDING_EXTERNAL_OES                         0x8D67

#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES                     0x8D68

#endif



/*------------------------------------------------------------------------*
@@ -546,9 +549,9 @@ typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); 
#define GL_OES_vertex_type_10_10_10_2 1

#endif



/* GL_OES_texture_external */

#ifndef GL_OES_texture_external

#define GL_OES_texture_external 1

/* GL_OES_EGL_image_external */

#ifndef GL_OES_EGL_image_external

#define GL_OES_EGL_image_external 1

#endif



/*------------------------------------------------------------------------*

services/surfaceflinger/GLExtensions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void GLExtensions::initWithGLStrings( 
        mHaveNpot = true;

    }



    if (hasExtension("GL_OES_texture_external")) {

    if (hasExtension("GL_OES_EGL_image_external")) {

        mHaveTextureExternal = true;

    } else if (strstr(mRenderer.string(), "Adreno")) {

        // hack for Adreno 200

services/surfaceflinger/LayerBlur.cpp

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ void LayerBlur::onDraw(const Region& clip) const 
    Region::const_iterator it = clip.begin();

    Region::const_iterator const end = clip.end();

    if (it != end) {

#if defined(GL_OES_texture_external)

#if defined(GL_OES_EGL_image_external)

        if (GLExtensions::getInstance().haveTextureExternal()) {

            glDisable(GL_TEXTURE_EXTERNAL_OES);

        }

services/surfaceflinger/LayerDim.cpp

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void LayerDim::onDraw(const Region& clip) const 
        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);

        glColor4f(0, 0, 0, alpha);



#if defined(GL_OES_texture_external)

#if defined(GL_OES_EGL_image_external)

        if (GLExtensions::getInstance().haveTextureExternal()) {

            glDisable(GL_TEXTURE_EXTERNAL_OES);

        }