diff options
author | egdaniel <egdaniel@google.com> | 2016-06-15 14:28:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-15 14:28:18 -0700 |
commit | 4132de7069b0088665af52ffea3a42b055f51b79 (patch) | |
tree | 1fdb5f8f93dcb02779d796fee39de9f5ec1c68c8 /include | |
parent | 963632f686cd642344429f64e6a53262fe592828 (diff) |
Revert of Refactoring of GPU NormalMap handling out into its own class (patchset #9 id:160001 of https://codereview.chromium.org/2043393002/ )
Reason for revert:
break deps roll
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
> Committed: https://skia.googlesource.com/skia/+/a7d1e2a57aef2aa4913d4380646d60bbab761318
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/2068983005
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkFlattenable.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index 5eabcb3d6d..260ea33dab 100644 --- a/include/core/SkFlattenable.h +++ b/include/core/SkFlattenable.h @@ -81,7 +81,6 @@ public: kSkShader_Type, kSkUnused_Type, // used to be SkUnitMapper kSkXfermode_Type, - kNormalSource_Type, }; typedef sk_sp<SkFlattenable> (*Factory)(SkReadBuffer&); |