commit ced5e837735593c3ee538cb56bb481286ce2895f
author Robert Phillips <robertphillips@google.com> Tue Mar 23 09:36:53 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 23 15:44:58 2021 +0000
tree 62f75680197a7b19ada7a25b50836c4d25d2cea4
parent ed3c75b0a5a2b24b76b1837137589471ff37684f

Retract GrRenderTarget from GrCaps & GrProgramDesc where possible

Fully retracting GrRenderTarget is still blocked on Dawn, D3D,
and Vk uses.

Change-Id: I59ebce40d85134f8ee18c143df2a3f4b70c3dcb1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/386840
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrProgramDesc.h

diff --git a/src/gpu/GrProgramDesc.h b/src/gpu/GrProgramDesc.h
index 910751e..96dec23 100644
--- a/src/gpu/GrProgramDesc.h
+++ b/src/gpu/GrProgramDesc.h
@@ -132,7 +132,7 @@
 
     // TODO(skia:11372): Incorporate this into caps interface (part of makeDesc, or a parallel
     // function), so other backends can include their information in the description.
-    static SkString Describe(GrRenderTarget*, const GrProgramInfo&, const GrCaps&);
+    static SkString Describe(const GrProgramInfo&, const GrCaps&);
 
 protected:
     friend class GrDawnCaps;
@@ -152,11 +152,10 @@
      * Builds a program descriptor.
      *
      * @param desc          The built descriptor
-     * @param renderTarget  The target of the draw
      * @param programInfo   Program information need to build the key
      * @param caps          the caps
      **/
-    static void Build(GrProgramDesc*, GrRenderTarget*, const GrProgramInfo&, const GrCaps&);
+    static void Build(GrProgramDesc*, const GrProgramInfo&, const GrCaps&);
 
     // This is strictly an OpenGL call since the other backends have additional data in their keys.
     static bool BuildFromData(GrProgramDesc* desc, const void* keyData, size_t keyLength) {