diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2017-10-24 10:59:03 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-25 15:59:18 +0000 |
| commit | c17bf32a1bf2f79a8c4a281c2ad312a3cdb610cd (patch) | |
| tree | daac8294c72cd1bfd370291faf3dbc364460be8e /src/gpu/ops | |
| parent | a045eea29eb79254248d7e2666825a1ca7d23d4e (diff) | |
Convert geometry shaders to operate in Skia device space
Defers the transformation to normalized window coordinates until after
the geometry shader. Merges vertex and a geometry shader builders into
a single compilation unit with a common base class. Updates CCPR
geometry shaders accordingly.
Bug: skia:
Change-Id: If93c90e978b1fdc7120febd05cfb05810fd496b5
Reviewed-on: https://skia-review.googlesource.com/62980
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/ops')
| -rw-r--r-- | src/gpu/ops/GrAAConvexPathRenderer.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/ops/GrDashOp.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/ops/GrMSAAPathRenderer.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/ops/GrOvalOpFactory.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp index 47c404595e..0e37238389 100644 --- a/src/gpu/ops/GrAAConvexPathRenderer.cpp +++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp @@ -26,7 +26,7 @@ #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLUniformHandler.h" #include "glsl/GrGLSLVarying.h" -#include "glsl/GrGLSLVertexShaderBuilder.h" +#include "glsl/GrGLSLVertexGeoBuilder.h" #include "ops/GrMeshDrawOp.h" GrAAConvexPathRenderer::GrAAConvexPathRenderer() { diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp index 070d979bee..6b014fffbf 100644 --- a/src/gpu/ops/GrDashOp.cpp +++ b/src/gpu/ops/GrDashOp.cpp @@ -22,7 +22,7 @@ #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLUniformHandler.h" #include "glsl/GrGLSLVarying.h" -#include "glsl/GrGLSLVertexShaderBuilder.h" +#include "glsl/GrGLSLVertexGeoBuilder.h" #include "ops/GrMeshDrawOp.h" using AAMode = GrDashOp::AAMode; diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp index 2a3235daa6..27d78a782c 100644 --- a/src/gpu/ops/GrMSAAPathRenderer.cpp +++ b/src/gpu/ops/GrMSAAPathRenderer.cpp @@ -23,7 +23,7 @@ #include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLUtil.h" -#include "glsl/GrGLSLVertexShaderBuilder.h" +#include "glsl/GrGLSLVertexGeoBuilder.h" #include "ops/GrMeshDrawOp.h" #include "ops/GrRectOpFactory.h" diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp index 99aadbc087..a3256602af 100644 --- a/src/gpu/ops/GrOvalOpFactory.cpp +++ b/src/gpu/ops/GrOvalOpFactory.cpp @@ -21,7 +21,7 @@ #include "glsl/GrGLSLUniformHandler.h" #include "glsl/GrGLSLUtil.h" #include "glsl/GrGLSLVarying.h" -#include "glsl/GrGLSLVertexShaderBuilder.h" +#include "glsl/GrGLSLVertexGeoBuilder.h" #include "ops/GrMeshDrawOp.h" #include "ops/GrSimpleMeshDrawOpHelper.h" |