diff options
| author |  egdaniel <egdaniel@google.com> | 2016-06-14 15:30:05 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-14 15:30:05 -0700 |
| commit | da743935fa0aba854a96654a474454b09e5488e8 (patch) | |
| tree | b1b6a4f2e919f1bf226e6d52716c208b1b1b6613 /gyp | |
| parent | 85730abbf860b1cccb00e0d7046b0cc3c6df1c02 (diff) | |
Revert of Refactoring of GPU NormalMap handling out into its own class (patchset #7 id:120001 of https://codereview.chromium.org/2043393002/ )
Reason for revert:
Breaking build and deps roll. Need to move include of SkBitmapProcShader in SkLightingShader.cpp from gpu include list to general list.
Original issue's description:
> Refactoring of GPU NormalMap handling out into its own class.
>
> The purpose of this change is to refactor the handling of normal maps out of SkLightingShader, laying the groundwork to eventually allow for multiple normal sources.
>
> What this CL includes:
>
> - Created a new 'NormalMapFP', out of the existing normal map reading behavior in LightingFP.
>
> - Encapsulates this new fragment processor on a new class NormalMapSource.
>
> - Created a NormalSource abstraction that will interface with SkLightingShader.
>
> - Adapted SkLightingShader to use the normals from its NormalSource field ON THE GPU SIDE. No changes done to the CPU side yet.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2043393002
>
> Committed: https://skia.googlesource.com/skia/+/87b0dd00cf9409c5fc990f5d0bb7c0df837f08da
TBR=reed@google.com,dvonbeck@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2062133004
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index d3102e4f92..ff3e270534 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -154,7 +154,6 @@ '<(skia_src_path)/core/SkLayerInfo.h', '<(skia_src_path)/core/SkLightingShader.h', '<(skia_src_path)/core/SkLightingShader.cpp', - '<(skia_src_path)/core/SkLightingShader_NormalSource.cpp', '<(skia_src_path)/core/SkLinearBitmapPipeline.cpp', '<(skia_src_path)/core/SkLinearBitmapPipeline.h', '<(skia_src_path)/core/SkLinearBitmapPipeline_core.h', |