summaryrefslogtreecommitdiffstats
path: root/BuildTools
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-03-27 02:50:36 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-03-27 02:50:36 +0000
commit79acfb39aaab7f3b34e94dfe9228384088984e7e (patch)
tree3df18ba341012c03c1ca4ea006e38f27b2762c47 /BuildTools
parentUpdated linux Vulkan library (fixed https://github.com/DiligentGraphics/Dilig... (diff)
downloadDiligentCore-79acfb39aaab7f3b34e94dfe9228384088984e7e.tar.gz
DiligentCore-79acfb39aaab7f3b34e94dfe9228384088984e7e.zip
Enabled format validation on Linux
Diffstat (limited to 'BuildTools')
-rwxr-xr-xBuildTools/FormatValidation/clang-format_linux_10.0.0bin0 -> 2265160 bytes
-rwxr-xr-xBuildTools/FormatValidation/clang-format_mac_10.0.0 (renamed from BuildTools/FormatValidation/clang-format_10.0.0)bin2349840 -> 2349840 bytes
-rwxr-xr-xBuildTools/FormatValidation/validate_format_linux.sh13
-rwxr-xr-xBuildTools/FormatValidation/validate_format_mac.sh2
4 files changed, 7 insertions, 8 deletions
diff --git a/BuildTools/FormatValidation/clang-format_linux_10.0.0 b/BuildTools/FormatValidation/clang-format_linux_10.0.0
new file mode 100755
index 00000000..c3b9422c
--- /dev/null
+++ b/BuildTools/FormatValidation/clang-format_linux_10.0.0
Binary files differ
diff --git a/BuildTools/FormatValidation/clang-format_10.0.0 b/BuildTools/FormatValidation/clang-format_mac_10.0.0
index cf170123..cf170123 100755
--- a/BuildTools/FormatValidation/clang-format_10.0.0
+++ b/BuildTools/FormatValidation/clang-format_mac_10.0.0
Binary files differ
diff --git a/BuildTools/FormatValidation/validate_format_linux.sh b/BuildTools/FormatValidation/validate_format_linux.sh
index 7400e26b..07d583a4 100755
--- a/BuildTools/FormatValidation/validate_format_linux.sh
+++ b/BuildTools/FormatValidation/validate_format_linux.sh
@@ -1,8 +1,7 @@
#!/bin/bash
-#python clang-format-validate.py -r \
-# --exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h \
-# --exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h \
-# --exclude ../../Graphics/GraphicsEngineVulkan/shaders/* \
-# ../../Common ../../Graphics ../../Platforms ../../Primitives
-echo "Format validation is not yet enabled for DiligentCore module on Linux"
-
+python clang-format-validate.py --clang-format-executable ./clang-format_linux_10.0.0 \
+-r ../../Common ../../Graphics ../../Platforms ../../Primitives ../../Tests \
+--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h \
+--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h \
+--exclude ../../Graphics/GraphicsEngineVulkan/shaders/GenerateMipsCS_inc.h \
+--exclude ../../Tests/DiligentCoreAPITest/assets/*
diff --git a/BuildTools/FormatValidation/validate_format_mac.sh b/BuildTools/FormatValidation/validate_format_mac.sh
index cbb4cdf5..e90ba762 100755
--- a/BuildTools/FormatValidation/validate_format_mac.sh
+++ b/BuildTools/FormatValidation/validate_format_mac.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-python clang-format-validate.py --clang-format-executable ./clang-format_10.0.0 \
+python clang-format-validate.py --clang-format-executable ./clang-format_mac_10.0.0 \
-r ../../Common ../../Graphics ../../Platforms ../../Primitives ../../Tests \
--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h \
--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h \