Skip to content

Commit 371fde5

Browse files
johnstiles-googleSkia Commit-Bot
authored andcommitted
Rename 'DefaultSettings' golden outputs to 'StandaloneSettings'.
I realized that "DefaultSettings" as a name suffix was unclear, because "Default" is a different settings mode from skslc running with --nosettings. In --nosettings mode, skslc uses "standalone" settings. Change-Id: I1f5d80df0a21cec55948c4ad146169bcb34f4999 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318210 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
1 parent 5fba9ae commit 371fde5

File tree

45 files changed

+6
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+6
-7
lines changed

BUILD.gn

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -696,11 +696,10 @@ if (skia_compile_sksl_tests) {
696696
sksl_glsl_tests_outputs +=
697697
[ "$target_out_dir/" +
698698
rebase_path("$dir/golden/$name.glsl", target_out_dir) ]
699-
sksl_glsl_settings_tests_outputs += [
700-
"$target_out_dir/" +
701-
rebase_path("$dir/golden/${name}DefaultSettings.glsl",
702-
target_out_dir),
703-
]
699+
sksl_glsl_settings_tests_outputs +=
700+
[ "$target_out_dir/" +
701+
rebase_path("$dir/golden/${name}StandaloneSettings.glsl",
702+
target_out_dir) ]
704703
}
705704

706705
action("compile_sksl_tests") {

gn/compile_sksl_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def compile(skslc, input, target, extension):
4545

4646
target = os.path.join(targetDir, tail)
4747
if settings == "--nosettings":
48-
target += "DefaultSettings"
48+
target += "StandaloneSettings"
4949

5050
if ext == ".fp":
5151
# First, compile the CPP. If we get an error, stop here.

gn/sksl_tests.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ sksl_glsl_tests_sources = [
235235
]
236236

237237
# Tests in sksl_glsl_settings_tests_sources will be compiled twice, once with --settings and once
238-
# using --nosettings. In the latter mode, DefaultSettings is appended to the output filename.
238+
# using --nosettings. In the latter mode, StandaloneSettings is appended to the output filename.
239239
sksl_glsl_settings_tests_sources = [
240240
"$_tests/sksl/blend/BlendClear.sksl",
241241
"$_tests/sksl/blend/BlendColor.sksl",

0 commit comments

Comments
 (0)