commit 962708fbb937e0538c6226b13e01b3dc5684212e
author Robert Phillips <robertphillips@google.com> Wed Mar 03 14:42:04 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 04 14:29:57 2021 +0000
tree 0b29cd7d35203148040fb1e6c1ecb42532bc6a85
parent b9bd12d6f8ab796b023e3be56ab319f7cfad23b9

GrGlGpu::ProgramCache no longer holds a GrGlGpu back pointer

In the threaded compilation world, the GrUtilityContext active on
a given thread will have to be passed in to the cache.

Change-Id: Id4f59b2e710080ab808275aeb2ffbcab38b3eadc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379061
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/gl/GrGLGpuProgramCache.cpp

diff --git a/src/gpu/gl/GrGLGpuProgramCache.cpp b/src/gpu/gl/GrGLGpuProgramCache.cpp
index 4bc0e78..702b2de 100644
--- a/src/gpu/gl/GrGLGpuProgramCache.cpp
+++ b/src/gpu/gl/GrGLGpuProgramCache.cpp
@@ -28,9 +28,9 @@
     GrGLPrecompiledProgram fPrecompiledProgram;
 };
 
-GrGLGpu::ProgramCache::ProgramCache(GrGLGpu* gpu)
-    : fMap(gpu->getContext()->priv().options().fRuntimeProgramCacheSize)
-    , fGpu(gpu) {}
+GrGLGpu::ProgramCache::ProgramCache(int runtimeProgramCacheSize)
+    : fMap(runtimeProgramCacheSize) {
+}
 
 GrGLGpu::ProgramCache::~ProgramCache() {}
 
@@ -48,18 +48,20 @@
     fMap.reset();
 }
 
-sk_sp<GrGLProgram> GrGLGpu::ProgramCache::findOrCreateProgram(GrRenderTarget* renderTarget,
+sk_sp<GrGLProgram> GrGLGpu::ProgramCache::findOrCreateProgram(GrDirectContext* dContext,
+                                                              GrRenderTarget* renderTarget,
                                                               const GrProgramInfo& programInfo) {
-    const GrCaps& caps = *fGpu->caps();
+    const GrCaps* caps = dContext->priv().caps();
 
-    GrProgramDesc desc = caps.makeDesc(renderTarget, programInfo);
+    GrProgramDesc desc = caps->makeDesc(renderTarget, programInfo);
     if (!desc.isValid()) {
-        GrCapsDebugf(&caps, "Failed to gl program descriptor!\n");
+        GrCapsDebugf(caps, "Failed to gl program descriptor!\n");
         return nullptr;
     }
 
     Stats::ProgramCacheResult stat;
-    sk_sp<GrGLProgram> tmp = this->findOrCreateProgram(renderTarget, desc, programInfo, &stat);
+    sk_sp<GrGLProgram> tmp = this->findOrCreateProgram(dContext, renderTarget, desc,
+                                                       programInfo, &stat);
     if (!tmp) {
         fStats.incNumInlineCompilationFailures();
     } else {
@@ -69,7 +71,8 @@
     return tmp;
 }
 
-sk_sp<GrGLProgram> GrGLGpu::ProgramCache::findOrCreateProgram(GrRenderTarget* renderTarget,
+sk_sp<GrGLProgram> GrGLGpu::ProgramCache::findOrCreateProgram(GrDirectContext* dContext,
+                                                              GrRenderTarget* renderTarget,
                                                               const GrProgramDesc& desc,
                                                               const GrProgramInfo& programInfo,
                                                               Stats::ProgramCacheResult* stat) {
@@ -79,7 +82,7 @@
         // We've pre-compiled the GL program, but don't have the GrGLProgram scaffolding
         const GrGLPrecompiledProgram* precompiledProgram = &((*entry)->fPrecompiledProgram);
         SkASSERT(precompiledProgram->fProgramID != 0);
-        (*entry)->fProgram = GrGLProgramBuilder::CreateProgram(fGpu, renderTarget, desc,
+        (*entry)->fProgram = GrGLProgramBuilder::CreateProgram(dContext, renderTarget, desc,
                                                                programInfo, precompiledProgram);
         if (!(*entry)->fProgram) {
             // Should we purge the program ID from the cache at this point?
@@ -91,7 +94,7 @@
         *stat = Stats::ProgramCacheResult::kPartial;
     } else if (!entry) {
         // We have a cache miss
-        sk_sp<GrGLProgram> program = GrGLProgramBuilder::CreateProgram(fGpu, renderTarget,
+        sk_sp<GrGLProgram> program = GrGLProgramBuilder::CreateProgram(dContext, renderTarget,
                                                                        desc, programInfo);
         if (!program) {
             fStats.incNumCompilationFailures();
@@ -105,7 +108,9 @@
     return (*entry)->fProgram;
 }
 
-bool GrGLGpu::ProgramCache::precompileShader(const SkData& key, const SkData& data) {
+bool GrGLGpu::ProgramCache::precompileShader(GrDirectContext* dContext,
+                                             const SkData& key,
+                                             const SkData& data) {
     GrProgramDesc desc;
     if (!GrProgramDesc::BuildFromData(&desc, key.data(), key.size())) {
         return false;
@@ -118,7 +123,7 @@
     }
 
     GrGLPrecompiledProgram precompiledProgram;
-    if (!GrGLProgramBuilder::PrecompileProgram(&precompiledProgram, fGpu, data)) {
+    if (!GrGLProgramBuilder::PrecompileProgram(dContext, &precompiledProgram, data)) {
         return false;
     }