Revert "Add ExternalTexture class into RenderEngine interface"
Revert submission 14086921-renderengine-external-tex
Reason for revert: Potential culprit for b/185361988
Reverted Changes:
I7796764e2:Update WaylandRenderSurface to accomodate interfac...
I13904eec4:Update Readback VTS to align with RenderEngine int...
I222c71e6e:Add ExternalTexture class into RenderEngine interf...
Change-Id: I1501890f4861a3df7ce273f1fe2ccdb275e2632c
diff --git a/services/surfaceflinger/ClientCache.h b/services/surfaceflinger/ClientCache.h
index a9b8177..0d597c8 100644
--- a/services/surfaceflinger/ClientCache.h
+++ b/services/surfaceflinger/ClientCache.h
@@ -19,7 +19,6 @@
#include <android-base/thread_annotations.h>
#include <binder/IBinder.h>
#include <gui/LayerState.h>
-#include <renderengine/RenderEngine.h>
#include <ui/GraphicBuffer.h>
#include <utils/RefBase.h>
#include <utils/Singleton.h>
@@ -40,11 +39,7 @@
bool add(const client_cache_t& cacheId, const sp<GraphicBuffer>& buffer);
void erase(const client_cache_t& cacheId);
- std::shared_ptr<renderengine::ExternalTexture> get(const client_cache_t& cacheId);
-
- // Always called immediately after setup. Will be set to non-null, and then should never be
- // called again.
- void setRenderEngine(renderengine::RenderEngine* renderEngine) { mRenderEngine = renderEngine; }
+ sp<GraphicBuffer> get(const client_cache_t& cacheId);
void removeProcess(const wp<IBinder>& processToken);
@@ -64,7 +59,7 @@
std::mutex mMutex;
struct ClientCacheBuffer {
- std::shared_ptr<renderengine::ExternalTexture> buffer;
+ sp<GraphicBuffer> buffer;
std::set<wp<ErasedRecipient>> recipients;
};
std::map<wp<IBinder> /*caching process*/,
@@ -78,7 +73,6 @@
};
sp<CacheDeathRecipient> mDeathRecipient;
- renderengine::RenderEngine* mRenderEngine = nullptr;
bool getBuffer(const client_cache_t& cacheId, ClientCacheBuffer** outClientCacheBuffer)
REQUIRES(mMutex);