ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

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

Browse Source 
Merge commit '793b2293797ea930078640c4827d3cbdf449c227'

* commit '793b2293797ea930078640c4827d3cbdf449c227':
  surfaceflinger / GL extensions cleanup
This commit is contained in:
Mathias Agopian 2010-09-16 18:26:19 -07:00 committed by Android Git Automerger
commit fe0a0af7bd
7 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opengl/include/GLES/glext.h
View File

@ -211,9 +211,12 @@ typedef void* GLeglImageOES;
#define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 #define GL_VERTEX_ARRAY_BINDING_OES 0x85B5
#endif #endif
/* GL_OES_texture_external */ /* GL_OES_EGL_image_external */
#ifndef GL_TEXTURE_EXTERNAL_OES #ifndef GL_OES_EGL_image_external
#define GL_TEXTURE_EXTERNAL_OES 0x8D65 #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 #endif
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
@ -782,9 +785,9 @@ typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arra
typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array);
#endif #endif
/* GL_OES_texture_external */ /* GL_OES_EGL_image_external */
#ifndef GL_OES_texture_external #ifndef GL_OES_EGL_image_external
#define GL_OES_texture_external 1 #define GL_OES_EGL_image_external 1
#endif #endif
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*

13
opengl/include/GLES2/gl2ext.h
View File

@ -146,9 +146,12 @@ typedef void* GLeglImageOES;
#define GL_INT_10_10_10_2_OES 0x8DF7 #define GL_INT_10_10_10_2_OES 0x8DF7
#endif #endif
/* GL_OES_texture_external */ /* GL_OES_EGL_image_external */
#ifndef GL_TEXTURE_EXTERNAL_OES #ifndef GL_OES_EGL_image_external
#define GL_TEXTURE_EXTERNAL_OES 0x8D65 #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 #endif
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
@ -546,9 +549,9 @@ typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array);
#define GL_OES_vertex_type_10_10_10_2 1 #define GL_OES_vertex_type_10_10_10_2 1
#endif #endif
/* GL_OES_texture_external */ /* GL_OES_EGL_image_external */
#ifndef GL_OES_texture_external #ifndef GL_OES_EGL_image_external
#define GL_OES_texture_external 1 #define GL_OES_EGL_image_external 1
#endif #endif
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*

2
services/surfaceflinger/GLExtensions.cpp
View File

@ -86,7 +86,7 @@ void GLExtensions::initWithGLStrings(
mHaveNpot = true; mHaveNpot = true;
} }
if (hasExtension("GL_OES_texture_external")) { if (hasExtension("GL_OES_EGL_image_external")) {
mHaveTextureExternal = true; mHaveTextureExternal = true;
} else if (strstr(mRenderer.string(), "Adreno")) { } else if (strstr(mRenderer.string(), "Adreno")) {
// hack for Adreno 200 // hack for Adreno 200

2
services/surfaceflinger/LayerBlur.cpp
View File

@ -146,7 +146,7 @@ void LayerBlur::onDraw(const Region& clip) const
Region::const_iterator it = clip.begin(); Region::const_iterator it = clip.begin();
Region::const_iterator const end = clip.end(); Region::const_iterator const end = clip.end();
if (it != end) { if (it != end) {
#if defined(GL_OES_texture_external) #if defined(GL_OES_EGL_image_external)
if (GLExtensions::getInstance().haveTextureExternal()) { if (GLExtensions::getInstance().haveTextureExternal()) {
glDisable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_EXTERNAL_OES);
} }

2
services/surfaceflinger/LayerDim.cpp
View File

@ -71,7 +71,7 @@ void LayerDim::onDraw(const Region& clip) const
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0, 0, 0, alpha); glColor4f(0, 0, 0, alpha);
#if defined(GL_OES_texture_external) #if defined(GL_OES_EGL_image_external)
if (GLExtensions::getInstance().haveTextureExternal()) { if (GLExtensions::getInstance().haveTextureExternal()) {
glDisable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_EXTERNAL_OES);
} }

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -1003,7 +1003,7 @@ void SurfaceFlinger::drawWormhole() const
glVertexPointer(2, GL_SHORT, 0, vertices); glVertexPointer(2, GL_SHORT, 0, vertices);
glTexCoordPointer(2, GL_SHORT, 0, tcoords); glTexCoordPointer(2, GL_SHORT, 0, tcoords);
glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);
#if defined(GL_OES_texture_external) #if defined(GL_OES_EGL_image_external)
if (GLExtensions::getInstance().haveTextureExternal()) { if (GLExtensions::getInstance().haveTextureExternal()) {
glDisable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_EXTERNAL_OES);
} }

8
services/surfaceflinger/TextureManager.cpp
View File

@ -43,7 +43,7 @@ TextureManager::TextureManager()
} }
GLenum TextureManager::getTextureTarget(const Image* image) { GLenum TextureManager::getTextureTarget(const Image* image) {
#if defined(GL_OES_texture_external) #if defined(GL_OES_EGL_image_external)
switch (image->target) { switch (image->target) {
case Texture::TEXTURE_EXTERNAL: case Texture::TEXTURE_EXTERNAL:
return GL_TEXTURE_EXTERNAL_OES; return GL_TEXTURE_EXTERNAL_OES;
@ -85,7 +85,7 @@ status_t TextureManager::initTexture(Image* pImage, int32_t format)
pImage->height = 0; pImage->height = 0;
GLenum target = GL_TEXTURE_2D; GLenum target = GL_TEXTURE_2D;
#if defined(GL_OES_texture_external) #if defined(GL_OES_EGL_image_external)
if (GLExtensions::getInstance().haveTextureExternal()) { if (GLExtensions::getInstance().haveTextureExternal()) {
if (format && isYuvFormat(format)) { if (format && isYuvFormat(format)) {
target = GL_TEXTURE_EXTERNAL_OES; target = GL_TEXTURE_EXTERNAL_OES;
@ -306,7 +306,7 @@ void TextureManager::activateTexture(const Texture& texture, bool filter)
if (target == GL_TEXTURE_2D) { if (target == GL_TEXTURE_2D) {
glBindTexture(GL_TEXTURE_2D, texture.name); glBindTexture(GL_TEXTURE_2D, texture.name);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
#if defined(GL_OES_texture_external) #if defined(GL_OES_EGL_image_external)
if (GLExtensions::getInstance().haveTextureExternal()) { if (GLExtensions::getInstance().haveTextureExternal()) {
glDisable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_EXTERNAL_OES);
} }
@ -329,7 +329,7 @@ void TextureManager::activateTexture(const Texture& texture, bool filter)
void TextureManager::deactivateTextures() void TextureManager::deactivateTextures()
{ {
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
#if defined(GL_OES_texture_external) #if defined(GL_OES_EGL_image_external)
if (GLExtensions::getInstance().haveTextureExternal()) { if (GLExtensions::getInstance().haveTextureExternal()) {
glDisable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_EXTERNAL_OES);
} }