Skip to content

Commit

Permalink
Update language in a few places. (#898)
Browse files Browse the repository at this point in the history
This CL clarifies various bits of text.
  • Loading branch information
dj2 authored Aug 6, 2020
1 parent 1f468e0 commit bcc1bae
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ CHM_FILE =
HHC_LOCATION =

# The GENERATE_CHI flag controls if a separate .chi index file is generated
# (YES) or that it should be included in the master .chm file (NO).
# (YES) or that it should be included in the primary .chm file (NO).
# The default value is: NO.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.

Expand Down
8 changes: 4 additions & 4 deletions src/amberscript/parser_subgroup_size_control_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ SHADER compute test_shader GLSL
END
PIPELINE compute pipeline
ATTACH test_shader
SUBGROUP dummy
SUBGROUP unused
END
END)";

Expand Down Expand Up @@ -167,7 +167,7 @@ END
PIPELINE compute pipeline
ATTACH test_shader
SUBGROUP test_shader
REQUIRED_SIZE dummy
REQUIRED_SIZE unused
END
END)";

Expand Down Expand Up @@ -256,7 +256,7 @@ END
PIPELINE compute pipeline
ATTACH test_shader
SUBGROUP test_shader
FULLY_POPULATED dummy
FULLY_POPULATED unused
END
END)";
Parser parser;
Expand All @@ -275,7 +275,7 @@ END
PIPELINE compute pipeline
ATTACH test_shader
SUBGROUP test_shader
VARYING_SIZE dummy
VARYING_SIZE unused
END
END)";
Parser parser;
Expand Down
4 changes: 2 additions & 2 deletions tools/check_code_format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
#
# This script assumes to be invoked at the project root directory.

FILES_TO_CHECK=$(git diff --name-only master | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$")
FILES_TO_CHECK=$(git diff --name-only main | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$")

if [ -z "${FILES_TO_CHECK}" ]; then
echo "No source code to check for formatting."
exit 0
fi

FORMAT_DIFF=$(git diff -U0 master -- ${FILES_TO_CHECK} | python ./tools/clang-format-diff.py -p1 -style=file)
FORMAT_DIFF=$(git diff -U0 main -- ${FILES_TO_CHECK} | python ./tools/clang-format-diff.py -p1 -style=file)

if [ -z "${FORMAT_DIFF}" ]; then
echo "All source code in PR properly formatted."
Expand Down

0 comments on commit bcc1bae

Please sign in to comment.