diff options
| author | Chris Craik <ccraik@google.com> | 2011-09-08 13:40:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-08 13:40:18 -0700 |
| commit | 3dbec40108fe6f94e4eff7c84979b6c3a5340c64 (patch) | |
| tree | 606827fca495e229be45ecda6acf72dd64e668d7 /Source/WebCore/platform/graphics/android/TransferQueue.cpp | |
| parent | 0ae24ff51fd869435c30e14d192c4416cc089498 (diff) | |
| parent | 2986d27084d881dbe6f9c3ae35430a5978b7e659 (diff) | |
| download | external_webkit-3dbec40108fe6f94e4eff7c84979b6c3a5340c64.zip external_webkit-3dbec40108fe6f94e4eff7c84979b6c3a5340c64.tar.gz external_webkit-3dbec40108fe6f94e4eff7c84979b6c3a5340c64.tar.bz2 | |
Merge "Deallocate graphics memory with onTrimMemory signals"
Diffstat (limited to 'Source/WebCore/platform/graphics/android/TransferQueue.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TransferQueue.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp index a13474a..50502f6 100644 --- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp +++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp @@ -134,6 +134,9 @@ bool TransferQueue::checkObsolete(int index) void TransferQueue::blitTileFromQueue(GLuint fboID, BaseTileTexture* destTex, GLuint srcTexId, GLenum srcTexTarget) { + // guarantee that we have a texture to blit into + destTex->requireTexture(); + // Then set up the FBO and copy the SurfTex content in. glBindFramebuffer(GL_FRAMEBUFFER, fboID); glFramebufferTexture2D(GL_FRAMEBUFFER, |