commit f7f5433a4590ce7437f66306dbe576646a78e437
author Brian Salomon <bsalomon@google.com> Tue Jul 28 09:23:35 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 28 13:52:07 2020 +0000
tree bec5a0647dcd4a3be1a04ee8f2d6f5fd5b8a0c6f
parent 07b00998203f2ff9b037275a4ea9dc1fb4e24a20

Remove GrSurfacePriv and GrRenderTargetPriv

No longer needed as GrSurface and GrRenderTarget are private.

Change-Id: I2ec653b2d9daa115233bb7eaa1f2b7f880772c0a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305730
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrProgramDesc.cpp

diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index d32eaf7..3b98fbc 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -13,7 +13,7 @@
 #include "src/gpu/GrPrimitiveProcessor.h"
 #include "src/gpu/GrProcessor.h"
 #include "src/gpu/GrProgramInfo.h"
-#include "src/gpu/GrRenderTargetPriv.h"
+#include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
@@ -163,9 +163,10 @@
     return gen_fp_meta_key(fp, caps, primProc.computeCoordTransformsKey(fp), b);
 }
 
-bool GrProgramDesc::Build(GrProgramDesc* desc, const GrRenderTarget* renderTarget,
-                          const GrProgramInfo& programInfo, const GrCaps& caps) {
-
+bool GrProgramDesc::Build(GrProgramDesc* desc,
+                          GrRenderTarget* renderTarget,
+                          const GrProgramInfo& programInfo,
+                          const GrCaps& caps) {
 #ifdef SK_DEBUG
     if (renderTarget) {
         SkASSERT(programInfo.backendFormat() == renderTarget->backendFormat());
@@ -222,7 +223,7 @@
 
     if (programInfo.requestedFeatures() & GrProcessor::CustomFeatures::kSampleLocations) {
         SkASSERT(pipeline.isHWAntialiasState());
-        b.add32(renderTarget->renderTargetPriv().getSamplePatternKey());
+        b.add32(renderTarget->getSamplePatternKey());
     }
 
     // --------DO NOT MOVE HEADER ABOVE THIS LINE--------------------------------------------------