commit c17bf32a1bf2f79a8c4a281c2ad312a3cdb610cd
author Chris Dalton <csmartdalton@google.com> Tue Oct 24 10:59:03 2017 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 25 15:59:18 2017 +0000
tree daac8294c72cd1bfd370291faf3dbc364460be8e
parent a045eea29eb79254248d7e2666825a1ca7d23d4e

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>

gn/gpu.gni

diff --git a/gn/gpu.gni b/gn/gpu.gni
index 8f82e71..c585dd2 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -466,8 +466,6 @@
   "$_src/gpu/glsl/GrGLSLFragmentShaderBuilder.h",
   "$_src/gpu/glsl/GrGLSLGeometryProcessor.cpp",
   "$_src/gpu/glsl/GrGLSLGeometryProcessor.h",
-  "$_src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp",
-  "$_src/gpu/glsl/GrGLSLGeometryShaderBuilder.h",
   "$_src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp",
   "$_src/gpu/glsl/GrGLSLPrimitiveProcessor.h",
   "$_src/gpu/glsl/GrGLSLProgramBuilder.cpp",
@@ -481,8 +479,8 @@
   "$_src/gpu/glsl/GrGLSLUtil.h",
   "$_src/gpu/glsl/GrGLSLVarying.cpp",
   "$_src/gpu/glsl/GrGLSLVarying.h",
-  "$_src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp",
-  "$_src/gpu/glsl/GrGLSLVertexShaderBuilder.h",
+  "$_src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp",
+  "$_src/gpu/glsl/GrGLSLVertexGeoBuilder.h",
   "$_src/gpu/glsl/GrGLSLXferProcessor.cpp",
   "$_src/gpu/glsl/GrGLSLXferProcessor.h",