commit 323471ec790df30330911f00c7eaed91fd5e68b0
author Robert Phillips <robertphillips@google.com> Mon Nov 11 11:33:37 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 11 17:17:01 2019 +0000
tree a0df5c2c2f967a378cd576ff8890b6b87bdf0a19
parent ee5864a1700e4dd24e146e5f4fe404a3777f3772

Remove GrProgramDesc's need for the GrGpu

Although not strictly necessary, being able to compute the program key w/o needing access to the Gpu will give us more flexibility.

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

src/gpu/gl/GrGLGpuProgramCache.cpp

diff --git a/src/gpu/gl/GrGLGpuProgramCache.cpp b/src/gpu/gl/GrGLGpuProgramCache.cpp
index 08260c0..9eff843 100644
--- a/src/gpu/gl/GrGLGpuProgramCache.cpp
+++ b/src/gpu/gl/GrGLGpuProgramCache.cpp
@@ -48,11 +48,11 @@
 GrGLProgram* GrGLGpu::ProgramCache::refProgram(GrGLGpu* gpu,
                                                GrRenderTarget* renderTarget,
                                                const GrProgramInfo& programInfo) {
-    // TODO: can this be unified between GL, Vk and Mtl?
-    // Get GrGLProgramDesc
-    GrProgramDesc desc;
+    const GrCaps& caps = *gpu->caps();
 
-    if (!GrProgramDesc::Build(&desc, renderTarget, programInfo, gpu)) {
+    GrProgramDesc desc;
+    if (!GrProgramDesc::Build(&desc, renderTarget, programInfo, caps)) {
+
         GrCapsDebugf(gpu->caps(), "Failed to gl program descriptor!\n");
         return nullptr;
     }