commit 9d96de49673cb6c916bfb797aad4f4e024ea73ca
author Fabien Sanglard <sanglardf@google.com> Tue Oct 11 00:15:18 2016 +0000
committer Fabien Sanglard <sanglardf@google.com> Tue Oct 11 00:15:18 2016 +0000
tree 99fc88f0e10e7764cd1a5ddf03189c2379dfbbd3
parent 90f923493fa053655a203c34ea491086aeb07602

Revert "Delete HWC1"

This reverts commit 90f923493fa053655a203c34ea491086aeb07602.

Change-Id: If9da49e3bc85f8ff21ac1bd22a6bab97e9aa3103

services/surfaceflinger/RenderEngine/GLES10RenderEngine.h

diff --git a/services/surfaceflinger/RenderEngine/GLES10RenderEngine.h b/services/surfaceflinger/RenderEngine/GLES10RenderEngine.h
index c416408..61abd6a 100644
--- a/services/surfaceflinger/RenderEngine/GLES10RenderEngine.h
+++ b/services/surfaceflinger/RenderEngine/GLES10RenderEngine.h
@@ -30,8 +30,12 @@
 class GLES10RenderEngine : public GLES11RenderEngine {
     virtual ~GLES10RenderEngine();
 protected:
+#ifdef USE_HWC2
     virtual void setupLayerBlending(bool premultipliedAlpha, bool opaque,
             float alpha) override;
+#else
+    virtual void setupLayerBlending(bool premultipliedAlpha, bool opaque, int alpha);
+#endif
 };
 
 // ---------------------------------------------------------------------------