summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2015-01-30 23:12:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-01-30 23:12:43 +0000
commit8a6b56651b42df2a073d68bbaf23e681acd7eeb5 (patch)
treefda0c9f4354e7e1211ac29445a558b5ae02f64aa /libs/hwui/OpenGLRenderer.cpp
parent0f2d0dbac6db56f123c89097e4c3431765887de6 (diff)
parent5515637540bedd8fc9a1a6e46a4b512dd45520a5 (diff)
Merge "Add a WAIT_FOR_GPU_COMPLETION option"
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 237833716e45..3ee9808bf5f1 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -20,7 +20,6 @@
#include "DeferredDisplayList.h"
#include "DisplayListRenderer.h"
-#include "Fence.h"
#include "GammaFontRenderer.h"
#include "Patch.h"
#include "PathTessellator.h"
@@ -506,7 +505,7 @@ void OpenGLRenderer::flushLayerUpdates() {
updateLayers();
flushLayers();
// Wait for all the layer updates to be executed
- AutoFence fence;
+ glFinish();
}
void OpenGLRenderer::markLayersAsBuildLayers() {