[RenderEngine] Organize RenderEngine directory.
This patch:
1. adds proper namespace renderengine to all RenderEngine code,
and namespace gl to all GLES related code
2. creates gl/ directory for GLES backend code
3. Reorder include header files, remove unused header files.
BUG: 112585051
Test: Build, flash, run display validation
Change-Id: I81f0b8831213607cde08562958f7c38ddaf4c9e6
diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index d8e7581..b0103df 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -23,7 +23,7 @@
class EventThread;
-namespace RE {
+namespace renderengine {
class RenderEngine;
}
@@ -36,7 +36,7 @@
// Extend this as needed for accessing SurfaceFlinger private (and public)
// functions.
- void setupRenderEngine(std::unique_ptr<RE::RenderEngine> renderEngine) {
+ void setupRenderEngine(std::unique_ptr<renderengine::RenderEngine> renderEngine) {
mFlinger->getBE().mRenderEngine = std::move(renderEngine);
}
@@ -313,7 +313,7 @@
return *this;
}
- auto& setRenderSurface(std::unique_ptr<RE::Surface> renderSurface) {
+ auto& setRenderSurface(std::unique_ptr<renderengine::Surface> renderSurface) {
mRenderSurface = std::move(renderSurface);
return *this;
}
@@ -352,7 +352,7 @@
const int32_t mDisplayId;
sp<ANativeWindow> mNativeWindow;
sp<DisplaySurface> mDisplaySurface;
- std::unique_ptr<RE::Surface> mRenderSurface;
+ std::unique_ptr<renderengine::Surface> mRenderSurface;
bool mSecure = false;
};