commit 713a6788528d4cc4cd477b2f546c8b922beb6dde
author Zach Reizner <zachr@google.com> Fri Jul 31 15:12:44 2015 -0700
committer Zach Reizner <zachr@google.com> Fri Aug 07 15:49:33 2015 -0700
tree 6bd39b93a08a71ce7cf5f392c4254e68671ad78e
parent cbe9c01336e23a63259db65d22d63d6a697b8813

Revert "Revert "drm_hwcomposer: have DrmDisplayCompositor do its own OpenGL composition""

This reverts commit cbe9c01336e23a63259db65d22d63d6a697b8813.

glworker.cpp

diff --git a/glworker.cpp b/glworker.cpp
index c737c45..e0d337b 100644
--- a/glworker.cpp
+++ b/glworker.cpp
@@ -702,6 +702,14 @@
   return ret;
 }
 
+int GLWorkerCompositor::CompositeAndFinish(hwc_layer_1 *layers,
+                                           size_t num_layers,
+                                           sp<GraphicBuffer> framebuffer) {
+  int ret = Composite(layers, num_layers, framebuffer);
+  glFinish();
+  return ret;
+}
+
 int GLWorker::DoComposition(GLWorkerCompositor &compositor, Work *work) {
   int ret =
       compositor.Composite(work->layers, work->num_layers, work->framebuffer);