diff --git a/README.md b/README.md index d104781bd31e7cbb2dac17aaf20c6c2334e1d12c..757cc9e286a9d26cca5dc9c1712332e11efa5385 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -Skia is a complete 2D graphic library for drawing Text, Geometries, and Images. +arong Skia is a complete 2D graphic library for drawing Text, Geometries, and Images. See full details, and build instructions, at https://skia.org. diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index 9fe6629dd7eadad8b95f93e6cd85dea4b83e85aa..2712549ba3e1db53ebc0ade26b5fdbccf8833e9e 100644 --- a/include/gpu/GrConfig.h +++ b/include/gpu/GrConfig.h @@ -14,7 +14,7 @@ /** * Gr defines are set to 0 or 1, rather than being undefined or defined */ - +#define SK_DUMP_STATS // open dump #if !defined(GR_CACHE_STATS) #if defined(SK_DEBUG) || defined(SK_DUMP_STATS) #define GR_CACHE_STATS 1 diff --git a/include/gpu/GrDirectContext.h b/include/gpu/GrDirectContext.h index 4ff25b0f5f34dda6bf7263d8eb17473248fc460c..e9b194c3fc4c4b4cd7ace06f50525f50d89f545e 100644 --- a/include/gpu/GrDirectContext.h +++ b/include/gpu/GrDirectContext.h @@ -8,9 +8,12 @@ #ifndef GrDirectContext_DEFINED #define GrDirectContext_DEFINED +#include + #include "include/gpu/GrRecordingContext.h" #include "include/gpu/GrBackendSurface.h" +#include "src/gpu/GrGpuResource.h" // We shouldn't need this but currently Android is relying on this being include transitively. #include "include/core/SkUnPreMultiply.h" @@ -282,6 +285,7 @@ public: * resource types. */ void purgeUnlockedResources(size_t bytesToPurge, bool preferScratchResources); + void purgeUnlockedResourcesByTag(bool scratchResourcesOnly, const GrGpuResourceTag tag); /** * This entry point is intended for instances where an app has been backgrounded or @@ -405,6 +409,7 @@ public: /** Enumerates all cached GPU resources and dumps their memory to traceMemoryDump. */ // Chrome is using this! void dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const; + void dumpMemoryStatisticsByTag(SkTraceMemoryDump* traceMemoryDump, GrGpuResourceTag tag) const; bool supportsDistanceFieldText() const;