commit f1d19c710e1e410a2307503c504bdf150f013ccd
author Alec Mouri <alecmouri@google.com> Thu Nov 15 00:00:50 2018 +0000
committer Alec Mouri <alecmouri@google.com> Thu Nov 15 00:00:50 2018 +0000
tree f7bac71e1fa1ca197df8c8a4b537b5f7136f4256
parent c956fa24bb8c1d433fd2ff62f69a03be8ecd59f3

Revert "Delete renderengine::Surface"

This reverts commit c956fa24bb8c1d433fd2ff62f69a03be8ecd59f3.

Reason for revert: breaks screenrecord (b/119534075)

Change-Id: Id50e0d23c44895f547e23fbd31f9102db0c75316

libs/renderengine/gl/GLES20RenderEngine.h

diff --git a/libs/renderengine/gl/GLES20RenderEngine.h b/libs/renderengine/gl/GLES20RenderEngine.h
index 6c50938..aebb319 100644
--- a/libs/renderengine/gl/GLES20RenderEngine.h
+++ b/libs/renderengine/gl/GLES20RenderEngine.h
@@ -40,6 +40,7 @@
 namespace gl {
 
 class GLImage;
+class GLSurface;
 
 class GLES20RenderEngine : public impl::RenderEngine {
 public:
@@ -51,10 +52,13 @@
     ~GLES20RenderEngine() override;
 
     std::unique_ptr<Framebuffer> createFramebuffer() override;
+    std::unique_ptr<Surface> createSurface() override;
     std::unique_ptr<Image> createImage() override;
 
     void primeCache() const override;
     bool isCurrent() const override;
+    bool setCurrentSurface(const Surface& surface) override;
+    void resetCurrentSurface() override;
     base::unique_fd flush() override;
     bool finish() override;
     bool waitFence(base::unique_fd fenceFd) override;
@@ -143,6 +147,8 @@
     mat4 mBt2020ToSrgb;
     mat4 mBt2020ToDisplayP3;
 
+    bool mRenderToFbo = false;
+    int32_t mSurfaceHeight = 0;
     int32_t mFboHeight = 0;
 
     // Current dataspace of layer being rendered