diff options
| author | Chris Craik <ccraik@google.com> | 2011-08-05 14:46:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-05 14:46:56 -0700 |
| commit | 0f4402f63d70cfc3c788f3e7693e4dfd781def11 (patch) | |
| tree | 4b5621e40fe187e6b2d860b63dd71fb8f516b574 /Source/WebCore/platform/graphics/android/GLUtils.cpp | |
| parent | 6b9d05281a529f9cd3e527fb8d657b338bb4fd7a (diff) | |
| parent | b7ca8e8315c6a4514200d2dbb823984267b4f9cc (diff) | |
| download | external_webkit-0f4402f63d70cfc3c788f3e7693e4dfd781def11.zip external_webkit-0f4402f63d70cfc3c788f3e7693e4dfd781def11.tar.gz external_webkit-0f4402f63d70cfc3c788f3e7693e4dfd781def11.tar.bz2 | |
Merge "Force NativeWindow rendering to use EXTERNAL_OES textures"
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLUtils.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLUtils.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLUtils.cpp b/Source/WebCore/platform/graphics/android/GLUtils.cpp index 039896e..d1fe51a 100644 --- a/Source/WebCore/platform/graphics/android/GLUtils.cpp +++ b/Source/WebCore/platform/graphics/android/GLUtils.cpp @@ -562,21 +562,6 @@ void GLUtils::createTextureFromEGLImage(GLuint texture, EGLImageKHR image, GLint glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter); } -GLenum GLUtils::getTextureTarget(android::SurfaceTexture* surfaceTexture) -{ -#if DEPRECATED_SURFACE_TEXTURE_MODE - if (surfaceTexture) { - GLenum target = surfaceTexture->getCurrentTextureTarget(); - // TODO: remove this translation when TEXTURE_2D+RGBA surface texture - // support is deprecated. - if (target == GL_TEXTURE_2D) - return 0; - return target; - } -#endif - return GL_TEXTURE_2D; -} - } // namespace WebCore #endif // USE(ACCELERATED_COMPOSITING) |