diff options
-rw-r--r-- | BUILD.gn | 5 | ||||
-rwxr-xr-x | gn/compile_processors.py | 7 | ||||
-rw-r--r-- | src/gpu/effects/GrSimpleTextureEffect.cpp | 6 |
3 files changed, 11 insertions, 7 deletions
@@ -454,7 +454,10 @@ if (skia_compile_processors) { if (host_os == "win") { skslc_path += ".exe" } - args = [ rebase_path(skslc_path) ] + args = [ + rebase_path(skslc_path), + rebase_path("infra/bots/.recipe_deps/depot_tools/clang-format"), + ] args += rebase_path(skia_gpu_processor_sources) } } else { diff --git a/gn/compile_processors.py b/gn/compile_processors.py index 9fc5c3de59..20b8d7d5bc 100755 --- a/gn/compile_processors.py +++ b/gn/compile_processors.py @@ -10,16 +10,17 @@ import subprocess import sys skslc = sys.argv[1] -processors = sys.argv[2:] +clangFormat = sys.argv[2] +processors = sys.argv[3:] for p in processors: path, _ = os.path.splitext(p) print("Recompiling " + p + "...") try: subprocess.check_output([skslc, p, path + ".h"]) - subprocess.check_call("clang-format --sort-includes=false -i \"" + + subprocess.check_call(clangFormat + " --sort-includes=false -i \"" + path + ".h\"", shell=True) subprocess.check_output([skslc, p, path + ".cpp"]) - subprocess.check_call("clang-format --sort-includes=false -i \"" + + subprocess.check_call(clangFormat + " --sort-includes=false -i \"" + path + ".cpp\"", shell=True) except subprocess.CalledProcessError as err: print("### Error compiling " + p + ":") diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp index a7ef7801d9..cab078b109 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.cpp +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp @@ -82,9 +82,9 @@ sk_sp<GrFragmentProcessor> GrSimpleTextureEffect::TestCreate(GrProcessorTestData kTileModes[testData->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))], kTileModes[testData->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))], }; - GrSamplerParams params(tileModes, - testData->fRandom->nextBool() ? GrSamplerParams::kBilerp_FilterMode - : GrSamplerParams::kNone_FilterMode); + GrSamplerParams params(tileModes, testData->fRandom->nextBool() + ? GrSamplerParams::kBilerp_FilterMode + : GrSamplerParams::kNone_FilterMode); const SkMatrix& matrix = GrTest::TestMatrix(testData->fRandom); sk_sp<GrColorSpaceXform> colorSpaceXform = GrTest::TestColorXform(testData->fRandom); |