Delete RenderEngine unused code
* V0 skia implementation beat the prior change deleting unused code, so
delete bindExternalTextureBuffer there.
* Remove useNativeFenceSync, now that there's no more usages
* Remove impl::RenderEngine, since there's no need for a private
impl-superclass spanning every RenderEngine implementation
* Clean up mock/RenderEngine
Bug: 168553972
Test: builds
Change-Id: I6f760510656b90b30d86b04fc70c19067a4491cd
diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index 94ba153..7cfe207 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
@@ -193,7 +193,7 @@
// initialize the renderer while GL is current
std::unique_ptr<SkiaGLRenderEngine> engine =
- std::make_unique<SkiaGLRenderEngine>(args, display, config, ctxt, placeholder,
+ std::make_unique<SkiaGLRenderEngine>(display, config, ctxt, placeholder,
protectedContext, protectedPlaceholder);
ALOGI("OpenGL ES informations:");
@@ -246,11 +246,10 @@
return config;
}
-SkiaGLRenderEngine::SkiaGLRenderEngine(const RenderEngineCreationArgs& args, EGLDisplay display,
- EGLConfig config, EGLContext ctxt, EGLSurface placeholder,
- EGLContext protectedContext, EGLSurface protectedPlaceholder)
- : renderengine::skia::SkiaRenderEngine(args),
- mEGLDisplay(display),
+SkiaGLRenderEngine::SkiaGLRenderEngine(EGLDisplay display, EGLConfig config, EGLContext ctxt,
+ EGLSurface placeholder, EGLContext protectedContext,
+ EGLSurface protectedPlaceholder)
+ : mEGLDisplay(display),
mEGLConfig(config),
mEGLContext(ctxt),
mPlaceholderSurface(placeholder),
diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.h b/libs/renderengine/skia/SkiaGLRenderEngine.h
index eb098cb..b8387b2 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.h
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.h
@@ -36,8 +36,8 @@
class SkiaGLRenderEngine : public skia::SkiaRenderEngine {
public:
static std::unique_ptr<SkiaGLRenderEngine> create(const RenderEngineCreationArgs& args);
- SkiaGLRenderEngine(const RenderEngineCreationArgs& args, EGLDisplay display, EGLConfig config,
- EGLContext ctxt, EGLSurface placeholder, EGLContext protectedContext,
+ SkiaGLRenderEngine(EGLDisplay display, EGLConfig config, EGLContext ctxt,
+ EGLSurface placeholder, EGLContext protectedContext,
EGLSurface protectedPlaceholder);
~SkiaGLRenderEngine() override{};
diff --git a/libs/renderengine/skia/SkiaRenderEngine.h b/libs/renderengine/skia/SkiaRenderEngine.h
index 3c5d0cf..2352c7e 100644
--- a/libs/renderengine/skia/SkiaRenderEngine.h
+++ b/libs/renderengine/skia/SkiaRenderEngine.h
@@ -33,20 +33,14 @@
// TODO: Put common skia stuff here that can be shared between the GL & Vulkan backends
// Currently mostly just handles all the no-op / missing APIs
-class SkiaRenderEngine : public impl::RenderEngine {
+class SkiaRenderEngine : public RenderEngine {
public:
static std::unique_ptr<SkiaRenderEngine> create(const RenderEngineCreationArgs& args);
- SkiaRenderEngine(const RenderEngineCreationArgs& args) : RenderEngine(args){};
~SkiaRenderEngine() override {}
virtual void primeCache() const override{};
virtual void genTextures(size_t /*count*/, uint32_t* /*names*/) override{};
virtual void deleteTextures(size_t /*count*/, uint32_t const* /*names*/) override{};
- virtual status_t bindExternalTextureBuffer(uint32_t /*texName*/,
- const sp<GraphicBuffer>& /*buffer*/,
- const sp<Fence>& /*fence*/) {
- return 0;
- }; // EXCLUDES(mRenderingMutex);
virtual void cacheExternalTextureBuffer(const sp<GraphicBuffer>& /*buffer*/){};
virtual void unbindExternalTextureBuffer(uint64_t /*bufferId*/){};