diff options
| author |  Mike Klein <mtklein@google.com> | 2017-06-27 22:52:03 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 22:52:10 +0000 |
| commit | 5ce397205528f82084fc650c2ce27d246c01da33 (patch) | |
| tree | 3e359ae172fed10fce8204163d6d372b0c3f6207 /src/sksl/SkSLCPP.h | |
| parent | 3fe44544c93759e7791ee0df3e5d172cb0f268b6 (diff) | |
Revert "Re-land sksl fragment processor support"
This reverts commit c070939fd1a954b7a492bc30f0cf64a664b90181.
Reason for revert:
This has some knock-on effects in the generation of Android.bp from our GN files. See gn/gn_to_bp.py? We're seeing things like "tmp/tmpsBVycx/gen/" end up in the include search path in Android.bp, which obviously don't exist there...
Original change's description:
> Re-land sksl fragment processor support
>
> This reverts commit ed50200682e0de72c3abecaa4d5324ebcd1ed9f9.
>
> Bug: skia:
> Change-Id: I9caa7454b391450620d6989dc472abb3cf7a2cab
> Reviewed-on: https://skia-review.googlesource.com/20965
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
TBR=benjaminwagner@google.com,ethannicholas@google.com
Change-Id: I502486b5405923b322429219f4cc396a45a14cea
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20990
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/sksl/SkSLCPP.h')
| -rw-r--r-- | src/sksl/SkSLCPP.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/sksl/SkSLCPP.h b/src/sksl/SkSLCPP.h deleted file mode 100644 index 47f8a4080b..0000000000 --- a/src/sksl/SkSLCPP.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2017 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SKSL_CPP -#define SKSL_CPP - -// functions used by CPP programs created by skslc - -#include "SkPoint.h" - -// macros to make sk_Caps.<cap name> work from C++ code -#define sk_Caps (*args.fShaderCaps) - -#define floatPrecisionVaries floatPrecisionVaries() - -// functions to make GLSL constructors work from C++ code -inline SkPoint vec2(float xy) { return SkPoint::Make(xy, xy); } - -inline SkPoint vec2(float x, float y) { return SkPoint::Make(x, y); } - -#endif |