diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-07-31 11:57:21 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-31 18:39:23 +0000 |
| commit | c722f79b6c8919e1a8a0df6d4d7735c5a8a1b5e8 (patch) | |
| tree | f85d2595f5545e2f01d89cc1cf2a0d412cb0d5ea /tools | |
| parent | d301629d1dad5da36d6f8225f17b92a3f36eaf2a (diff) | |
clang on windows support
1) Run python bin/fetch-clang-win
2) Set clang_win = "../bin/clang_win"
3) ???
4) Profit
Most changes here are to pass the right -mfoo flags to Clang
to enable advanced instruction sets, or fixed warning-as-errors.
BUG=skia:2679
Change-Id: Ieed145d35c209131c7c16fdd3ee11a3de4a1a921
Reviewed-on: https://skia-review.googlesource.com/28740
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/colorspaceinfo.cpp | 2 | ||||
| -rw-r--r-- | tools/sk_tool_utils.cpp | 2 | ||||
| -rw-r--r-- | tools/viewer/Viewer.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/colorspaceinfo.cpp b/tools/colorspaceinfo.cpp index c35e735d8c..8250a03bcb 100644 --- a/tools/colorspaceinfo.cpp +++ b/tools/colorspaceinfo.cpp @@ -476,7 +476,7 @@ int main(int argc, char** argv) { { SkColorSpaceTransferFn colorSpaceTransferFn; - SkMatrix44 toXYZD50; + SkMatrix44 toXYZD50(SkMatrix44::kIdentity_Constructor); if (colorSpace->isNumericalTransferFn(&colorSpaceTransferFn) && colorSpace->toXYZD50(&toXYZD50)) { SkString description = SkICCGetColorProfileTag(colorSpaceTransferFn, toXYZD50); diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp index 47f4aae397..d957d53f12 100644 --- a/tools/sk_tool_utils.cpp +++ b/tools/sk_tool_utils.cpp @@ -369,7 +369,7 @@ void create_tetra_normal_map(SkBitmap* bm, const SkIRect& dst) { } } -#if defined(_MSC_VER) +#if !defined(__clang__) && defined(_MSC_VER) // MSVC takes ~2 minutes to compile this function with optimization. // We don't really care to wait that long for this function. #pragma optimize("", off) diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 6f01f2df01..9e941f4dcf 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -729,7 +729,7 @@ void Viewer::drawSlide(SkCanvas* canvas) { if (ColorMode::kLegacy != fColorMode) { auto transferFn = (ColorMode::kColorManagedLinearF16 == fColorMode) ? SkColorSpace::kLinear_RenderTargetGamma : SkColorSpace::kSRGB_RenderTargetGamma; - SkMatrix44 toXYZ; + SkMatrix44 toXYZ(SkMatrix44::kIdentity_Constructor); SkAssertResult(fColorSpacePrimaries.toXYZD50(&toXYZ)); cs = SkColorSpace::MakeRGB(transferFn, toXYZ); } |