aboutsummaryrefslogtreecommitdiff
path: root/glworker.cpp
diff options
context:
space:
mode:
authorZach Reizner <zachr@google.com>2015-07-31 15:12:44 -0700
committerZach Reizner <zachr@google.com>2015-08-07 15:49:33 -0700
commit713a6788528d4cc4cd477b2f546c8b922beb6dde (patch)
tree6bd39b93a08a71ce7cf5f392c4254e68671ad78e /glworker.cpp
parentcbe9c01336e23a63259db65d22d63d6a697b8813 (diff)
downloaddrm_hwcomposer-713a6788528d4cc4cd477b2f546c8b922beb6dde.tar.gz
Revert "Revert "drm_hwcomposer: have DrmDisplayCompositor do its own OpenGL composition""
This reverts commit cbe9c01336e23a63259db65d22d63d6a697b8813.
Diffstat (limited to 'glworker.cpp')
-rw-r--r--glworker.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/glworker.cpp b/glworker.cpp
index c737c45..e0d337b 100644
--- a/glworker.cpp
+++ b/glworker.cpp
@@ -702,6 +702,14 @@ int GLWorkerCompositor::Composite(hwc_layer_1 *layers, size_t num_layers,
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);