diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-21 13:41:08 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-21 19:13:43 +0000 |
| commit | 99938a8ef24e2dd5b39f78638742e9b50ab6d9bf (patch) | |
| tree | e3842210db20a4574e9cec37ae7f049aaff27b65 /gn | |
| parent | d728f0c1a94fe926b59d8ebc9ae174019ccd3606 (diff) | |
Merge GrGLSLShaderVar and GrShaderVar
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5087
Change-Id: Ib8943a1da1ea495554feaf5b0992b94fbb9539ab
Reviewed-on: https://skia-review.googlesource.com/5087
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/gpu.gni | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index 84b3624f02..fca4939302 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -185,6 +185,7 @@ skia_gpu_sources = [ "$_src/gpu/GrTraceMarker.h", "$_src/gpu/GrTracing.h", "$_src/gpu/GrTestUtils.cpp", + "$_src/gpu/GrShaderVar.cpp", "$_src/gpu/GrSWMaskHelper.cpp", "$_src/gpu/GrSWMaskHelper.h", "$_src/gpu/GrSoftwarePathRenderer.cpp", @@ -421,7 +422,6 @@ skia_gpu_sources = [ "$_src/gpu/glsl/GrGLSLProgramDataManager.h", "$_src/gpu/glsl/GrGLSLShaderBuilder.cpp", "$_src/gpu/glsl/GrGLSLShaderBuilder.h", - "$_src/gpu/glsl/GrGLSLShaderVar.h", "$_src/gpu/glsl/GrGLSLUniformHandler.h", "$_src/gpu/glsl/GrGLSLUtil.cpp", "$_src/gpu/glsl/GrGLSLUtil.h", |