diff options
author | Brian Osman <brianosman@google.com> | 2017-11-16 14:02:11 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-16 14:02:23 +0000 |
commit | 24f9c19172e149602551cd6716b3cc264c1d40ef (patch) | |
tree | 48f622c34b80fa9d6595f1050b313033ec8e4104 /src/sksl | |
parent | 554c1f0508a95b5411036a95d1bb62c0d5fdeae8 (diff) |
Revert "Fix precision caps and rrect/ellipse effect precisions"
This reverts commit e42180022720f2fcfd3c634cad855506a7940591.
Reason for revert: Also may be responsible for layout test failures? Playing it safe.
Original change's description:
> Fix precision caps and rrect/ellipse effect precisions
>
> Replaces all the complex precision caps with a single flag that says
> whether "float" == fp32. Updates the ellipse and rrect effects to
> use float coords, and use the scale workaround when float != fp32.
>
> Bug: skia:7190
> Change-Id: Ieccff9f38acd05e5cec78fe90d01a5da901a9307
> Reviewed-on: https://skia-review.googlesource.com/70961
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com,ethannicholas@google.com
Change-Id: Idca2f0390e7a0eb85010255183f2f27332b8d26d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7190
Reviewed-on: https://skia-review.googlesource.com/72540
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/sksl')
-rw-r--r-- | src/sksl/SkSLCPP.h | 2 | ||||
-rw-r--r-- | src/sksl/SkSLIRGenerator.cpp | 2 | ||||
-rw-r--r-- | src/sksl/SkSLUtil.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/sksl/SkSLCPP.h b/src/sksl/SkSLCPP.h index 612a200f28..d67990820b 100644 --- a/src/sksl/SkSLCPP.h +++ b/src/sksl/SkSLCPP.h @@ -18,7 +18,7 @@ using std::abs; // macros to make sk_Caps.<cap name> work from C++ code #define sk_Caps (*args.fShaderCaps) -#define floatIs32Bits floatIs32Bits() +#define floatPrecisionVaries floatPrecisionVaries() // functions to make GLSL constructors work from C++ code inline SkPoint float2(float xy) { return SkPoint::Make(xy, xy); } diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp index cfa3049a2c..18b36a4b0f 100644 --- a/src/sksl/SkSLIRGenerator.cpp +++ b/src/sksl/SkSLIRGenerator.cpp @@ -140,7 +140,7 @@ static void fill_caps(const SKSL_CAPS_CLASS& caps, CAP(mustEnableSpecificAdvBlendEqs); CAP(mustDeclareFragmentShaderOutput); CAP(canUseAnyFunctionInShader); - CAP(floatIs32Bits); + CAP(floatPrecisionVaries); CAP(integerSupport); #undef CAP } diff --git a/src/sksl/SkSLUtil.h b/src/sksl/SkSLUtil.h index 1d9d53f6e8..a8be7ef72f 100644 --- a/src/sksl/SkSLUtil.h +++ b/src/sksl/SkSLUtil.h @@ -135,8 +135,8 @@ public: return false; } - bool floatIs32Bits() const { - return true; + bool floatPrecisionVaries() const { + return false; } bool integerSupport() const { |