Merge branch 'master'

3 files changed, 58 insertions, 27 deletions

diff --git a/BuildTools/FormatValidation/validate_format_linux.sh b/BuildTools/FormatValidation/validate_format_linux.sh
index 484672d8..8e804421 100755
--- a/BuildTools/FormatValidation/validate_format_linux.sh
+++ b/BuildTools/FormatValidation/validate_format_linux.sh
@@ -1,33 +1,9 @@
 #!/bin/bash
 
-BIN=$(find . -name 'clang-format_linux_*')
+source validate_format_linux_implementation.sh
 
-## Try to launch the bin
-eval "$BIN --version >/dev/null 2> /dev/null"
-if [ $? -ne 0 ]; then
-  ## BIN failed to run, try to get a system installed clang-format
-  SYS_BIN=$(which clang-format 2> /dev/null)
-  if [ $? -ne 0 ]; then
-    echo "WARNING: skipping format validation as no suitable executable was found"
-    BIN=""
-  else
-    BIN_VERSION=$(echo $BIN | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
-    SYS_BIN_VERSION=$(eval "$SYS_BIN --version" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
-    if [ "$BIN_VERSION" != "$SYS_BIN_VERSION" ]; then
-      echo "WARNING: could not load the provided clang-format for validation."
-      echo "   clang-format exists in the system path however its version is $SYS_BIN_VERSION instead of $BIN_VERSION"
-      echo "   Should the validation fail, you can try skipping it by setting the cmake option:"
-      echo "   DILIGENT_SKIP_FORMAT_VALIDATION"
-    fi
-    BIN="$SYS_BIN"
-  fi
-fi
-
-if [ ! -z "$BIN" ]; then
-  python clang-format-validate.py --clang-format-executable "$BIN" \
-  -r ../../Common ../../Graphics ../../Platforms ../../Primitives ../../Tests \
+validate_format ../../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/*
-fi
diff --git a/BuildTools/FormatValidation/validate_format_linux_implementation.sh b/BuildTools/FormatValidation/validate_format_linux_implementation.sh
new file mode 100755
index 00000000..e661a52c
--- /dev/null
+++ b/BuildTools/FormatValidation/validate_format_linux_implementation.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+## Get the path of this file no matter where it is called from
+## Solution from: https://stackoverflow.com/a/246128/2140449
+VALIDATE_FORMAT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+errcho(){ echo "$@" 1>&2; }
+
+function find_validator_bin() {
+  local BIN=$(find "$VALIDATE_FORMAT_DIR" -name 'clang-format_linux_*')
+  
+  ## Try to launch the bin
+  eval "$BIN --version >/dev/null 2> /dev/null"
+  if [ $? -ne 0 ]; then
+    ## BIN failed to run, try to get a system installed clang-format
+    local SYS_BIN=$(which clang-format 2> /dev/null)
+    if [ $? -ne 0 ]; then
+      errcho "WARNING: skipping format validation as no suitable executable was found"
+      BIN=""
+    else
+      local BIN_VERSION=$(echo $BIN | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
+      local SYS_BIN_VERSION=$(eval "$SYS_BIN --version" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
+      if [ "$BIN_VERSION" != "$SYS_BIN_VERSION" ]; then
+        errcho "WARNING: could not load the provided clang-format for validation."
+        errcho "   clang-format exists in the system path however its version is $SYS_BIN_VERSION instead of $BIN_VERSION"
+        errcho "   Should the validation fail, you can try skipping it by setting the cmake option:"
+        errcho "   DILIGENT_SKIP_FORMAT_VALIDATION"
+      fi
+      BIN="$SYS_BIN"
+    fi
+  fi
+  echo "$BIN"
+}
+
+function validate_format() {
+  local BIN=$(find_validator_bin)
+  if [ ! -z "$BIN" ]; then
+    python "$VALIDATE_FORMAT_DIR/clang-format-validate.py" --clang-format-executable "$BIN" -r "$@"
+  fi
+}
+
+## Example usage:
+#
+# #!/bin/bash
+# source /PATH/TO/THIS/FILE/validate_format_linux_implementation.sh 
+#
+# validate_format ../../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/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
index f818813f..99501a4e 100644
--- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
@@ -110,12 +110,15 @@ set(SHADERS
     shaders/GenerateMips/GenerateMipsLinearOddYCS.hlsl
 )
 
+set(COMPILED_SHADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders/GenerateMips)
+file(MAKE_DIRECTORY "${COMPILED_SHADERS_DIR}")
+
 set_source_files_properties(${SHADERS} PROPERTIES 
     VS_SHADER_TYPE Compute
     VS_SHADER_ENTRYPOINT main
     VS_SHADER_MODEL 5.0
     VS_SHADER_VARIABLE_NAME "g_p%(Filename)"
-    VS_SHADER_OUTPUT_HEADER_FILE "${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders/GenerateMips/%(Filename).h"
+    VS_SHADER_OUTPUT_HEADER_FILE "${COMPILED_SHADERS_DIR}/%(Filename).h"
     #VS_SHADER_FLAGS "/O3"
 )