Migrate some last instances of GrContext to GrDirectContext (d2345212) · Commits · e / os / android_frameworks_base

libs/hwui/pipeline/skia/ShaderCache.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		*/

		#include "ShaderCache.h"
		#include <GrContext.h>
		#include <GrDirectContext.h>
		#include <log/log.h>
		#include <openssl/sha.h>
		#include <algorithm>
		@@ -206,7 +206,7 @@ void ShaderCache::store(const SkData& key, const SkData& data) {
		}
		}

		void ShaderCache::onVkFrameFlushed(GrContext* context) {
		void ShaderCache::onVkFrameFlushed(GrDirectContext* context) {
		{
		std::lock_guard<std::mutex> lock(mMutex);

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public:
		* Pipeline cache is saved on disk only if the size of the data has changed or there was
		* a new shader compiled.
		*/
		void onVkFrameFlushed(GrContext* context);
		void onVkFrameFlushed(GrDirectContext* context);

		private:
		// Creation and (the lack of) destruction is handled internally.

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ CacheManager::CacheManager()
		SkGraphics::SetFontCacheLimit(mMaxCpuFontCacheBytes);
		}

		void CacheManager::reset(sk_sp<GrContext> context) {
		void CacheManager::reset(sk_sp<GrDirectContext> context) {
		if (context != mGrContext) {
		destroy();
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		#define CACHEMANAGER_H

		#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
		#include <GrContext.h>
		#include <GrDirectContext.h>
		#endif
		#include <SkSurface.h>
		#include <utils/String8.h>
		@@ -58,13 +58,13 @@ private:
		explicit CacheManager();

		#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
		void reset(sk_sp<GrContext> grContext);
		void reset(sk_sp<GrDirectContext> grContext);
		#endif
		void destroy();

		const size_t mMaxSurfaceArea;
		#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
		sk_sp<GrContext> mGrContext;
		sk_sp<GrDirectContext> mGrContext;
		#endif

		const size_t mMaxResourceBytes;

+1 −1