diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-06-08 10:49:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-08 19:43:47 +0000 |
| commit | 1471df99f0c7b5d9df43e7462d68a6635c3c59be (patch) | |
| tree | 5da4a18207b47907ba3d538c38a9d8ae2dfff9ef /samplecode | |
| parent | d0d409d3ebd083b4f5263949e404c1700c615d3b (diff) | |
Remove include of GrGLProgramBuilder.h from GrGLProgram.h and GrVkPipelineState.h
Make GrGLProgram and GrCkPipelineState cons. public and remove builder friendship.
Neither GrGLProgram nor GrVkPipelineState need to know their Desc so remove it.
Move the VK desc subclass defn. to GrVkPipelineStateBuilder since it needs it while
GrVkPipelineState does not.
Some IWYU improvements.
Move declaration of the built-in uniform struct to GrGLSLUniformHandler.h from GrGLSLProgramBuilder.h.
Change-Id: Ib46817408a83a79a0f718ba2bc19411410d9065a
Reviewed-on: https://skia-review.googlesource.com/133060
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleCCPRGeometry.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp index 52e1181e8c..f2f88bff45 100644 --- a/samplecode/SampleCCPRGeometry.cpp +++ b/samplecode/SampleCCPRGeometry.cpp @@ -24,6 +24,7 @@ #include "ccpr/GrCCCoverageProcessor.h" #include "ccpr/GrCCGeometry.h" #include "gl/GrGLGpu.cpp" +#include "glsl/GrGLSLFragmentProcessor.h" #include "ops/GrDrawOp.h" using TriPointInstance = GrCCCoverageProcessor::TriPointInstance; |