commit 48959460789fd9bdfe1d4cee1d109f5bd826ceaf
author Brian Salomon <bsalomon@google.com> Wed Aug 11 13:01:06 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Wed Aug 11 19:45:56 2021 +0000
tree 9c8e2f9382e74b08040901a48f20f7e010e8b9d3
parent 319c70a3c06b9b0846c9e41d55042a8c9620529d

Move ProgramImpl definitions into Processor subclass headers.

Move ProgramImpl function definitions into Processor subclass cpp files.

Delete separate h/cpp files.

Modify GrGLSLVaryingHandler::addPassThroughAttribute to break #include
cycle. It now takes a ShaderVar rather than a GP::Attribute, making
it slightly more flexible as the input can be any variable defined
in the vertex shader.

Bug: skia:11358
Change-Id: I94ee8cd44d29e194216592ecae5fd28de785c975
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438596
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/ops/GrDrawAtlasPathOp.cpp

diff --git a/src/gpu/ops/GrDrawAtlasPathOp.cpp b/src/gpu/ops/GrDrawAtlasPathOp.cpp
index fc4c2fb..eb5b74b 100644
--- a/src/gpu/ops/GrDrawAtlasPathOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasPathOp.cpp
@@ -7,13 +7,13 @@
 
 #include "src/gpu/ops/GrDrawAtlasPathOp.h"
 
+#include "src/gpu/GrGeometryProcessor.h"
 #include "src/gpu/GrOpFlushState.h"
 #include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrVertexWriter.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
-#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
 
@@ -104,7 +104,8 @@
 
         args.fFragBuilder->codeAppendf("half4 %s;", args.fOutputColor);
         args.fVaryingHandler->addPassThroughAttribute(
-                shader.fAttribs[shader.colorAttribIdx()], args.fOutputColor,
+                shader.fAttribs[shader.colorAttribIdx()].asShaderVar(),
+                args.fOutputColor,
                 GrGLSLVaryingHandler::Interpolation::kCanBeFlat);
     }