diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-11 15:40:20 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-11 15:55:36 -0700 |
| commit | 9b0332227d1f5d644e78f417c54ae1ec86ecaa1c (patch) | |
| tree | 38b7f49c62a7f5d4568b2a1c660e2586999919c6 /Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp | |
| parent | 9c2247ca3b85ced69521299cc63d666b2eefe782 (diff) | |
| download | external_webkit-9b0332227d1f5d644e78f417c54ae1ec86ecaa1c.zip external_webkit-9b0332227d1f5d644e78f417c54ae1ec86ecaa1c.tar.gz external_webkit-9b0332227d1f5d644e78f417c54ae1ec86ecaa1c.tar.bz2 | |
We shall restore the FBO id instead of setting it back to 0.
bug:6283539
Change-Id: I84b8d5e0a984cb98cedc43d755b04be521d675ca
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp b/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp index 26bd55d..9435065 100644 --- a/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp @@ -578,16 +578,6 @@ void GLUtils::createTextureWithBitmap(GLuint texture, const SkBitmap& bitmap, GL } glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter); - - // The following is a workaround -- remove when EGLImage texture upload is fixed. - GLuint fboID; - glGenFramebuffers(1, &fboID); - glBindFramebuffer(GL_FRAMEBUFFER, fboID); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0); - glCheckFramebufferStatus(GL_FRAMEBUFFER); // should return GL_FRAMEBUFFER_COMPLETE - - glBindFramebuffer(GL_FRAMEBUFFER, 0); // rebind the standard FBO - glDeleteFramebuffers(1, &fboID); } void GLUtils::updateTextureWithBitmap(GLuint texture, const SkBitmap& bitmap, |