Merge "Refactor SF. Move all GL operations in their own class."

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
index c789941,5d138d1..c6feee1
--- 1/services/surfaceflinger/SurfaceFlinger.cpp
--- 2/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@@ -70,14 -70,10 +70,16 @@@
  #include "DisplayHardware/HWComposer.h"
  #include "DisplayHardware/VirtualDisplaySurface.h"
  
+ #include "RenderEngine/RenderEngine.h"
+ 
  #define DISPLAY_COUNT       1
  
 +/*
 + * DEBUG_SCREENSHOTS: set to true to check that screenshots are not all
 + * black pixels.
 + */
 +#define DEBUG_SCREENSHOTS   false
 +
  EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);
  
  namespace android {

diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge