diff options
| author |  rmistry <rmistry@google.com> | 2015-08-26 06:48:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-26 06:48:27 -0700 |
| commit | 4bf69f7bbc073c1dc257f93f8c5b2a530123cb3c (patch) | |
| tree | d6c670d7230600b174d6f08799a7ad1f4b9c002e /gyp | |
| parent | 8cce8f139e4b91783722f11ccb6ac9bbdf8327e7 (diff) | |
Revert of Remove GrStagedProcessor, remove the word Stage as it applies to FPs (patchset #6 id:90001 of https://codereview.chromium.org/1307223004/ )
Reason for revert:
Causes bot failures:
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Mac10.9-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug/builds/1639
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/1702
https://uberchromegw.corp.google.com/i/client.skia.android/builders/Test-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Debug/builds/1223
Original issue's description:
> Remove GrStagedProcessor, remove the word Stage as it applies to FPs
>
> Committed: https://skia.googlesource.com/skia/+/24243446cdf7b7e4e132c2a0c387c7723777e0c7
TBR=joshualitt@google.com,egdaniel@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1306803003
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gpu.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi index 11beb94631..3e08a5055f 100644 --- a/gyp/gpu.gypi +++ b/gyp/gpu.gypi @@ -35,6 +35,7 @@ '<(skia_include_path)/gpu/GrRenderTarget.h', '<(skia_include_path)/gpu/GrResourceKey.h', '<(skia_include_path)/gpu/GrShaderVar.h', + '<(skia_include_path)/gpu/GrStagedProcessor.h', '<(skia_include_path)/gpu/GrSurface.h', '<(skia_include_path)/gpu/GrTexture.h', '<(skia_include_path)/gpu/GrTextureProvider.h', @@ -148,6 +149,7 @@ '<(skia_src_path)/gpu/GrPathUtils.cpp', '<(skia_src_path)/gpu/GrPathUtils.h', '<(skia_src_path)/gpu/GrPendingProgramElement.h', + '<(skia_src_path)/gpu/GrPendingFragmentStage.h', '<(skia_src_path)/gpu/GrPipeline.cpp', '<(skia_src_path)/gpu/GrPipeline.h', '<(skia_src_path)/gpu/GrPipelineBuilder.cpp', |