commit e9d9a3278fdf6708942df94b80f0b269602bc580
author Brian Osman <brianosman@google.com> Tue Sep 03 13:59:36 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 03 19:12:07 2019 +0000
tree a19f8105b96c569c1124914473f2b2fa0aa6fa7a
parent c7b263b603107acdb16b6570989e1ce5a2c7eb4e

Remove GrGLProgram cache stats, remove spurious declarations/includes

Change-Id: I5f3c17fc008a5ec92803000f17d7db65af1b4cfa
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/238901
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/gl/GrGLGpuProgramCache.cpp

diff --git a/src/gpu/gl/GrGLGpuProgramCache.cpp b/src/gpu/gl/GrGLGpuProgramCache.cpp
index 1213132..2c00fdf 100644
--- a/src/gpu/gl/GrGLGpuProgramCache.cpp
+++ b/src/gpu/gl/GrGLGpuProgramCache.cpp
@@ -7,20 +7,10 @@
 
 #include "src/gpu/gl/GrGLGpu.h"
 
-#include "src/core/SkTSearch.h"
 #include "src/gpu/GrProcessor.h"
 #include "src/gpu/GrProgramDesc.h"
-#include "src/gpu/gl/GrGLPathRendering.h"
 #include "src/gpu/gl/builders/GrGLProgramBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
-#include "src/gpu/glsl/GrGLSLProgramDataManager.h"
-
-#ifdef PROGRAM_CACHE_STATS
-// Display program cache usage
-static const bool c_DisplayCache{false};
-#endif
-
-typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
 
 struct GrGLGpu::ProgramCache::Entry {
     Entry(sk_sp<GrGLProgram> program) : fProgram(std::move(program)) {}
@@ -30,30 +20,9 @@
 
 GrGLGpu::ProgramCache::ProgramCache(GrGLGpu* gpu)
     : fMap(kMaxEntries)
-    , fGpu(gpu)
-#ifdef PROGRAM_CACHE_STATS
-    , fTotalRequests(0)
-    , fCacheMisses(0)
-    , fHashMisses(0)
-#endif
-{}
+    , fGpu(gpu) {}
 
-GrGLGpu::ProgramCache::~ProgramCache() {
-    // dump stats
-#ifdef PROGRAM_CACHE_STATS
-    if (c_DisplayCache) {
-        SkDebugf("--- Program Cache ---\n");
-        SkDebugf("Total requests: %d\n", fTotalRequests);
-        SkDebugf("Cache misses: %d\n", fCacheMisses);
-        SkDebugf("Cache miss %%: %f\n", (fTotalRequests > 0) ?
-                                            100.f * fCacheMisses / fTotalRequests :
-                                            0.f);
-        int cacheHits = fTotalRequests - fCacheMisses;
-        SkDebugf("Hash miss %%: %f\n", (cacheHits > 0) ? 100.f * fHashMisses / cacheHits : 0.f);
-        SkDebugf("---------------------\n");
-    }
-#endif
-}
+GrGLGpu::ProgramCache::~ProgramCache() {}
 
 void GrGLGpu::ProgramCache::abandon() {
     fMap.foreach([](std::unique_ptr<Entry>* e) {
@@ -64,12 +33,6 @@
 }
 
 void GrGLGpu::ProgramCache::reset() {
-#ifdef PROGRAM_CACHE_STATS
-    fTotalRequests = 0;
-    fCacheMisses = 0;
-    fHashMisses = 0;
-#endif
-
     fMap.reset();
 }
 
@@ -80,10 +43,6 @@
                                                const GrTextureProxy* const primProcProxies[],
                                                const GrPipeline& pipeline,
                                                bool isPoints) {
-#ifdef PROGRAM_CACHE_STATS
-    ++fTotalRequests;
-#endif
-
     // Get GrGLProgramDesc
     GrProgramDesc desc;
     if (!GrProgramDesc::Build(&desc, renderTarget, primProc, isPoints, pipeline, gpu)) {
@@ -97,9 +56,6 @@
     std::unique_ptr<Entry>* entry = fMap.find(desc);
     if (!entry) {
         // We have a cache miss
-#ifdef PROGRAM_CACHE_STATS
-        ++fCacheMisses;
-#endif
         GrGLProgram* program = GrGLProgramBuilder::CreateProgram(renderTarget, origin,
                                                                  primProc, primProcProxies,
                                                                  pipeline, &desc, fGpu);