aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/SkSLUtil.cpp
diff options
context:
space:
mode:
authorGravatar jvanverth <jvanverth@google.com>2016-10-10 09:18:23 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-10-10 09:18:23 -0700
commit15341a284e78651d2b47b89753044f8d6e7eda0a (patch)
tree80e2eecf6c4d11f4aa078afcb2181af156934b6f /src/sksl/SkSLUtil.cpp
parente75c19f6380dd07a19faa39edcdbd75c79c7414d (diff)
Revert of Turned on SkSL->GLSL compiler (patchset #47 id:1200001 of https://codereview.chromium.org/2288033003/ )
Reason for revert: Looks like it introduces new static initializers, and it's failing the Chrome roll. Original issue's description: > Turned on SkSL->GLSL compiler > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003 > > Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3 > Committed: https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310 > Committed: https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89 > Committed: https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b TBR=benjaminwagner@google.com,bsalomon@google.com,egdaniel@google.com,ethannicholas@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2403083002
Diffstat (limited to 'src/sksl/SkSLUtil.cpp')
-rw-r--r--src/sksl/SkSLUtil.cpp47
1 files changed, 0 insertions, 47 deletions
diff --git a/src/sksl/SkSLUtil.cpp b/src/sksl/SkSLUtil.cpp
index 51ad9fe808..327bffe4f1 100644
--- a/src/sksl/SkSLUtil.cpp
+++ b/src/sksl/SkSLUtil.cpp
@@ -9,48 +9,7 @@
namespace SkSL {
-std::string to_string(double value) {
- std::stringstream buffer;
- buffer << std::setprecision(std::numeric_limits<double>::digits10) << value;
- std::string result = buffer.str();
- if (result.find_last_of(".") == std::string::npos &&
- result.find_last_of("e") == std::string::npos) {
- result += ".0";
- }
- return result;
-}
-
-std::string to_string(int32_t value) {
- std::stringstream buffer;
- buffer << value;
- return buffer.str();
-}
-
-std::string to_string(uint32_t value) {
- std::stringstream buffer;
- buffer << value;
- return buffer.str();
-}
-
-std::string to_string(int64_t value) {
- std::stringstream buffer;
- buffer << value;
- return buffer.str();
-}
-
-std::string to_string(uint64_t value) {
- std::stringstream buffer;
- buffer << value;
- return buffer.str();
-}
-
int stoi(std::string s) {
- if (s.size() > 2 && s[0] == '0' && s[1] == 'x') {
- char* p;
- int result = strtoul(s.substr(2).c_str(), &p, 16);
- ASSERT(*p == 0);
- return result;
- }
return atoi(s.c_str());
}
@@ -59,12 +18,6 @@ double stod(std::string s) {
}
long stol(std::string s) {
- if (s.size() > 2 && s[0] == '0' && s[1] == 'x') {
- char* p;
- long result = strtoul(s.substr(2).c_str(), &p, 16);
- ASSERT(*p == 0);
- return result;
- }
return atol(s.c_str());
}