surfaceflinger: remove unused EGL data members
Remove SurfaceFlinger::mEGLDisplay and SurfaceFlinger::mEGLContext.
With this change, SurfaceFlinger does not use EGL directly anymore.
This also allows us to get rid of RenderEngine::getEGLContext.
Test: SurfaceFlinger_test
Change-Id: I7799d935367650508b741e62a53ce325fdc94234
diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
index dfd9856..2143c78 100644
--- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
@@ -183,10 +183,6 @@
return mEGLConfig;
}
-EGLContext RenderEngine::getEGLContext() const {
- return mEGLContext;
-}
-
bool RenderEngine::setCurrentSurface(EGLSurface surface) {
return eglMakeCurrent(mEGLDisplay, surface, surface, mEGLContext) == EGL_TRUE;
}
diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.h b/services/surfaceflinger/RenderEngine/RenderEngine.h
index 2d5bfa3..a3efdf6 100644
--- a/services/surfaceflinger/RenderEngine/RenderEngine.h
+++ b/services/surfaceflinger/RenderEngine/RenderEngine.h
@@ -136,7 +136,6 @@
EGLDisplay getEGLDisplay() const;
EGLConfig getEGLConfig() const;
- EGLContext getEGLContext() const;
};
// ---------------------------------------------------------------------------
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index bdbaf5f..4172d25 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -28,8 +28,6 @@
#include <stdatomic.h>
#include <optional>
-#include <EGL/egl.h>
-
#include <cutils/properties.h>
#include <log/log.h>
@@ -613,10 +611,6 @@
hasWideColorDisplay ? RenderEngine::WIDE_COLOR_SUPPORT : 0);
LOG_ALWAYS_FATAL_IF(mRenderEngine == nullptr, "couldn't create RenderEngine");
- // retrieve the EGL display/context that was selected/created
- mEGLDisplay = mRenderEngine->getEGLDisplay();
- mEGLContext = mRenderEngine->getEGLContext();
-
LOG_ALWAYS_FATAL_IF(mVrFlingerRequestsDisplay,
"Starting with vr flinger active is not currently supported.");
mHwc.reset(new HWComposer(mHwcServiceName));
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 2840774..58d9998 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -21,8 +21,6 @@
#include <stdint.h>
#include <sys/types.h>
-#include <EGL/egl.h>
-
/*
* NOTE: Make sure this file doesn't include anything from <gl/ > or <gl2/ >
*/
@@ -667,8 +665,6 @@
sp<EventThread> mInjectorEventThread;
sp<InjectVSyncSource> mVSyncInjector;
sp<EventControlThread> mEventControlThread;
- EGLContext mEGLContext;
- EGLDisplay mEGLDisplay;
sp<IBinder> mBuiltinDisplays[DisplayDevice::NUM_BUILTIN_DISPLAY_TYPES];
// Can only accessed from the main thread, these members