diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-08-27 10:12:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-27 10:12:24 +0200 |
commit | 3dc63a710f0ca845e6de9e8b4a2158a33743ad36 (patch) | |
tree | 7d8cfabb399fa0ebd547ce6224504b1149c25c8d /misc | |
parent | ddfef86836be8e30709006ac30bc83007823468c (diff) | |
parent | 4226d56ca9ec91c4878d47e3bce4784e5edc3006 (diff) |
Merge pull request #21469 from akien-mga/glsl-clang-format
Style: Enable clang-format on GLSL shaders
Diffstat (limited to 'misc')
-rwxr-xr-x | misc/hooks/pre-commit-clang-format | 2 | ||||
-rwxr-xr-x | misc/travis/clang-format.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index 016a43038b..4f13b2afcb 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -31,7 +31,7 @@ PARSE_EXTS=true # File types to parse. Only effective when PARSE_EXTS is true. # FILE_EXTS=".c .h .cpp .hpp" -FILE_EXTS=".c .h .cpp .hpp .cc .hh .cxx .m .mm .inc *.java" +FILE_EXTS=".c .h .cpp .hpp .cc .hh .cxx .m .mm .inc *.java *.glsl" # Use pygmentize instead of cat to parse diff with highlighting. # Install it with `pip install pygments` (Linux) or `easy_install Pygments` (Mac) diff --git a/misc/travis/clang-format.sh b/misc/travis/clang-format.sh index 5463998720..ee4d0b2a10 100755 --- a/misc/travis/clang-format.sh +++ b/misc/travis/clang-format.sh @@ -11,7 +11,7 @@ else RANGE=HEAD fi -FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java)$") +FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java|glsl)$") echo "Checking files:\n$FILES" # create a random filename to store our generated patch |