drm_hwcomposer: Provide internal version of glworker Commit()

In order to decouple Commit() calls from the issuing thread,
provide the internal _Commit() call to be enable it to be run
on its own thread.

Change-Id: I0c4823c94d6555566cbf7edbb83e12d0aedaf772
Sign-off-by: Robert Foss <robert.foss@collabora.com>

3 files changed, 21 insertions, 3 deletions

diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 92bbfd6..2ba6f70 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -295,7 +295,8 @@ int DrmDisplayCompositor::ApplySquash(DrmDisplayComposition *display_comp) {
 
   std::vector<DrmCompositionRegion> &regions = display_comp->squash_regions();
   ret = pre_compositor_->Composite(display_comp->layers().data(),
-                                   regions.data(), regions.size(), fb.buffer(),
+                                   regions.data(), regions.size(),
+                                   &squash_framebuffers_[squash_framebuffer_index_],
                                    display_comp->importer());
   pre_compositor_->Finish();
 
@@ -329,7 +330,8 @@ int DrmDisplayCompositor::ApplyPreComposite(
 
   std::vector<DrmCompositionRegion> &regions = display_comp->pre_comp_regions();
   ret = pre_compositor_->Composite(display_comp->layers().data(),
-                                   regions.data(), regions.size(), fb.buffer(),
+                                   regions.data(), regions.size(),
+                                   &framebuffers_[framebuffer_index_],
                                    display_comp->importer());
   pre_compositor_->Finish();
 
diff --git a/glworker.cpp b/glworker.cpp
index c0966f3..00a4ceb 100644
--- a/glworker.cpp
+++ b/glworker.cpp
@@ -581,6 +581,15 @@ GLWorkerCompositor::~GLWorkerCompositor() {
 int GLWorkerCompositor::Composite(DrmHwcLayer *layers,
                                   DrmCompositionRegion *regions,
                                   size_t num_regions,
+                                  DrmFramebuffer *framebuffer,
+                                  Importer *importer) {
+  return _Composite(layers, regions, num_regions,
+                    framebuffer->buffer(), importer);
+}
+
+int GLWorkerCompositor::_Composite(DrmHwcLayer *layers,
+                                  DrmCompositionRegion *regions,
+                                  size_t num_regions,
                                   const sp<GraphicBuffer> &framebuffer,
                                   Importer *importer) {
   ATRACE_CALL();
diff --git a/glworker.h b/glworker.h
index 26de55d..190ab3f 100644
--- a/glworker.h
+++ b/glworker.h
@@ -30,6 +30,7 @@
 #include <ui/GraphicBuffer.h>
 
 #include "autogl.h"
+#include "drmframebuffer.h"
 
 namespace android {
 
@@ -43,7 +44,7 @@ class GLWorkerCompositor {
 
   int Init();
   int Composite(DrmHwcLayer *layers, DrmCompositionRegion *regions,
-                size_t num_regions, const sp<GraphicBuffer> &framebuffer,
+                size_t num_regions, DrmFramebuffer *framebuffer,
                 Importer *importer);
   void Finish();
 
@@ -71,6 +72,12 @@ class GLWorkerCompositor {
     EGLSurface saved_egl_draw = EGL_NO_SURFACE;
   } private_;
 
+  int _Composite(DrmHwcLayer *layers,
+                 DrmCompositionRegion *regions,
+                 size_t num_regions,
+                 const sp<GraphicBuffer> &framebuffer,
+                 Importer *importer);
+
   int BeginContext();
   int EndContext();