Fixed NO_GLSLANG Android build configuration. Added CI build configs for NO_GLSLANG and NO_HLSL

Author: TheMostDiligent

.github/workflows/linux.yml

@@ -118,3 +118,76 @@ jobs:
           !${{runner.workspace}}/build/install/**/*.a
         retention-days: 90
 
+
+  build-clang-10-no-glslang:
+    strategy:
+      matrix:
+        config: [Debug]
+
+    runs-on: ubuntu-latest
+    name: Linux x64, Clang 10 NO_GLSLANG, ${{ matrix.config }}
+
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Configure dependencies
+      if: success()
+      run: |
+        sudo apt-get install build-essential libx11-dev libgl1-mesa-dev
+
+    - name: Configure CMake
+      if: success()
+      env:
+        CC: clang-10
+        CXX: clang++-10
+      shell: bash
+      run: |
+        cd $GITHUB_WORKSPACE/BuildTools/Scripts/github_actions
+        chmod +x configure_cmake.sh
+        ./configure_cmake.sh "linux" "${{runner.workspace}}" ${{ matrix.config }} "-DDILIGENT_NO_OPENGL=ON -DDILIGENT_NO_GLSLANG=ON"
+
+    - name: Build
+      if: success()
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config ${{ matrix.config }} --target install -j2
+
+
+  build-clang-10-no-glslang-no-hlsl:
+    strategy:
+      matrix:
+        config: [Release]
+
+    runs-on: ubuntu-latest
+    name: Linux x64, Clang 10 NO_GLSLANG NO_HLSL, ${{ matrix.config }}
+
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Configure dependencies
+      if: success()
+      run: |
+        sudo apt-get install build-essential libx11-dev libgl1-mesa-dev
+
+    - name: Configure CMake
+      if: success()
+      env:
+        CC: clang-10
+        CXX: clang++-10
+      shell: bash
+      run: |
+        cd $GITHUB_WORKSPACE/BuildTools/Scripts/github_actions
+        chmod +x configure_cmake.sh
+        ./configure_cmake.sh "linux" "${{runner.workspace}}" ${{ matrix.config }} "-DDILIGENT_NO_GLSLANG=ON -DDILIGENT_NO_HLSL=ON"
+
+    - name: Build
+      if: success()
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config ${{ matrix.config }} --target install -j2

BuildTools/Scripts/github_actions/configure_cmake.sh

@@ -32,5 +32,5 @@ if [ "$1" = "ios" ]; then
 fi
 
 if [ "$1" = "linux" ]; then
-  cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$3 -DDILIGENT_BUILD_TESTS=ON -DDILIGENT_NO_FORMAT_VALIDATION=ON -DCMAKE_INSTALL_PREFIX=install ..
+  cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$3 -DDILIGENT_BUILD_TESTS=ON -DDILIGENT_NO_FORMAT_VALIDATION=ON $4 -DCMAKE_INSTALL_PREFIX=install ..
 fi

Graphics/GraphicsEngineVulkan/CMakeLists.txt

@@ -194,7 +194,7 @@ set(PRIVATE_DEPENDENCIES
 )
 
 if (${DILIGENT_NO_HLSL})
-    message("HLSL support is disabled. Vulkan backend may not be able to consume SPIRV bytecode generated from HLSL.")
+    message("HLSL support is disabled. Vulkan backend will not be able to consume SPIRV bytecode generated from HLSL.")
 else()
     list(APPEND PRIVATE_DEPENDENCIES SPIRV-Tools-opt)
 endif()

Graphics/GraphicsEngineVulkan/include/GenerateMipsVkHelper.hpp

@@ -66,7 +66,9 @@ class GenerateMipsVkHelper
     VkImageLayout GenerateMipsCS(TextureViewVkImpl& TexView, DeviceContextVkImpl& Ctx, IShaderResourceBinding& SRB, VkImageSubresourceRange& SubresRange);
     VkImageLayout GenerateMipsBlit(TextureViewVkImpl& TexView, DeviceContextVkImpl& Ctx, VkImageSubresourceRange& SubresRange) const;
 
+#if !DILIGENT_NO_GLSLANG
     RenderDeviceVkImpl& m_DeviceVkImpl;
+#endif
 
     std::mutex                                                                       m_PSOMutex;
     std::unordered_map<TEXTURE_FORMAT, std::array<RefCntAutoPtr<IPipelineState>, 4>> m_PSOHash;

Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp

@@ -42,13 +42,14 @@
 #include "../../GraphicsTools/interface/CommonlyUsedStates.h"
 #include "../../GraphicsTools/interface/MapHelper.hpp"
 
-
+#if !DILIGENT_NO_GLSLANG
 // clang-format off
 static const char* g_GenerateMipsCSSource =
 {
     #include "../shaders/GenerateMipsCS_inc.h"
 };
 // clang-format on
+#endif
 
 namespace Diligent
 {
@@ -182,8 +183,12 @@ std::array<RefCntAutoPtr<IPipelineState>, 4> GenerateMipsVkHelper::CreatePSOs(TE
     return PSOs;
 }
 
-GenerateMipsVkHelper::GenerateMipsVkHelper(RenderDeviceVkImpl& DeviceVkImpl) :
-    m_DeviceVkImpl(DeviceVkImpl)
+GenerateMipsVkHelper::GenerateMipsVkHelper(RenderDeviceVkImpl& DeviceVkImpl)
+#if !DILIGENT_NO_GLSLANG
+    // clang-format off
+    : m_DeviceVkImpl{DeviceVkImpl}
+// clang-format on
+#endif
 {
 #if !DILIGENT_NO_GLSLANG
     BufferDesc ConstantsCBDesc;

Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp

@@ -45,22 +45,12 @@
 
 #if !DILIGENT_NO_HLSL
 #    include "spirv-tools/optimizer.hpp"
+#    include "SPIRVTools.hpp"
 #endif
 
 namespace Diligent
 {
 
-#if !DILIGENT_NO_HLSL
-namespace GLSLangUtils
-{
-void SpvOptimizerMessageConsumer(
-    spv_message_level_t level,
-    const char* /* source */,
-    const spv_position_t& /* position */,
-    const char* message);
-}
-#endif
-
 namespace
 {
 
@@ -80,7 +70,7 @@ bool StripReflection(const VulkanUtilities::VulkanLogicalDevice& LogicalDevice,
     }
 
     spvtools::Optimizer SpirvOptimizer{Target};
-    SpirvOptimizer.SetMessageConsumer(GLSLangUtils::SpvOptimizerMessageConsumer);
+    SpirvOptimizer.SetMessageConsumer(SpvOptimizerMessageConsumer);
     // Decorations defined in SPV_GOOGLE_hlsl_functionality1 are the only instructions
     // removed by strip-reflect-info pass. SPIRV offsets become INVALID after this operation.
     SpirvOptimizer.RegisterPass(spvtools::CreateStripReflectInfoPass());

Graphics/ShaderTools/CMakeLists.txt

@@ -72,24 +72,27 @@ endif()
 
 if(VULKAN_SUPPORTED OR METAL_SUPPORTED)
     set(ENABLE_SPIRV TRUE)
+    if (NOT ${DILIGENT_NO_GLSLANG})
+        set(USE_GLSLANG TRUE)
+        set(USE_SPIRV_TOOLS TRUE)
+    endif()
+    if (NOT ${DILIGENT_NO_HLSL})
+        set(USE_SPIRV_TOOLS TRUE)
+    endif()
 endif()
 
 if(ENABLE_SPIRV)
     list(APPEND SOURCE src/SPIRVShaderResources.cpp)
     list(APPEND INCLUDE include/SPIRVShaderResources.hpp)
 
-    if (NOT ${DILIGENT_NO_GLSLANG})
+    if (${USE_SPIRV_TOOLS})
+        list(APPEND SOURCE src/SPIRVTools.cpp)
+        list(APPEND INCLUDE include/SPIRVTools.hpp)
+    endif()
+
+    if (${USE_GLSLANG})
         list(APPEND SOURCE src/GLSLangUtils.cpp)
         list(APPEND INCLUDE include/GLSLangUtils.hpp)
-
-        if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-            # Disable the following warning:
-            #   moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
-            set_source_files_properties(src/SPIRVUtils.cpp
-            PROPERTIES
-                COMPILE_FLAGS -Wno-pessimizing-move
-            )
-        endif()
     endif()
 endif()
 
@@ -133,13 +136,19 @@ if(ENABLE_SPIRV)
         spirv-cross-core
     )
 
-    if (NOT ${DILIGENT_NO_GLSLANG})
+    if (${USE_SPIRV_TOOLS})
         target_link_libraries(Diligent-ShaderTools 
         PRIVATE
-            glslang
-            SPIRV
             SPIRV-Tools-opt
         )
+    endif()
+
+    if (${USE_GLSLANG})
+        target_link_libraries(Diligent-ShaderTools 
+        PRIVATE
+            SPIRV
+            glslang
+        )
 
         target_include_directories(Diligent-ShaderTools 
         PRIVATE

Graphics/ShaderTools/include/SPIRVTools.hpp

@@ -0,0 +1,40 @@
+/*
+ *  Copyright 2019-2021 Diligent Graphics LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  In no event and under no legal theory, whether in tort (including negligence), 
+ *  contract, or otherwise, unless required by applicable law (such as deliberate 
+ *  and grossly negligent acts) or agreed to in writing, shall any Contributor be
+ *  liable for any damages, including any direct, indirect, special, incidental, 
+ *  or consequential damages of any character arising as a result of this License or 
+ *  out of the use or inability to use the software (including but not limited to damages 
+ *  for loss of goodwill, work stoppage, computer failure or malfunction, or any and 
+ *  all other commercial damages or losses), even if such Contributor has been advised 
+ *  of the possibility of such damages.
+ */
+
+#pragma once
+
+#include "spirv-tools/libspirv.h"
+
+namespace Diligent
+{
+
+void SpvOptimizerMessageConsumer(
+    spv_message_level_t   level,
+    const char*           source,
+    const spv_position_t& position,
+    const char*           message);
+
+} // namespace Diligent

Graphics/ShaderTools/src/GLSLangUtils.cpp

@@ -42,6 +42,7 @@
 #include "DataBlobImpl.hpp"
 #include "RefCntAutoPtr.hpp"
 #include "ShaderToolsCommon.hpp"
+#include "SPIRVTools.hpp"
 
 #include "spirv-tools/optimizer.hpp"
 
@@ -335,54 +336,6 @@ class IncluderImpl : public ::glslang::TShader::Includer
 
 } // namespace
 
-void SpvOptimizerMessageConsumer(
-    spv_message_level_t level,
-    const char* /* source */,
-    const spv_position_t& /* position */,
-    const char* message)
-{
-    const char*            LevelText   = "message";
-    DEBUG_MESSAGE_SEVERITY MsgSeverity = DEBUG_MESSAGE_SEVERITY_INFO;
-    switch (level)
-    {
-        case SPV_MSG_FATAL:
-            // Unrecoverable error due to environment (e.g. out of memory)
-            LevelText   = "fatal error";
-            MsgSeverity = DEBUG_MESSAGE_SEVERITY_FATAL_ERROR;
-            break;
-
-        case SPV_MSG_INTERNAL_ERROR:
-            // Unrecoverable error due to SPIRV-Tools internals (e.g. unimplemented feature)
-            LevelText   = "internal error";
-            MsgSeverity = DEBUG_MESSAGE_SEVERITY_ERROR;
-            break;
-
-        case SPV_MSG_ERROR:
-            // Normal error due to user input.
-            LevelText   = "error";
-            MsgSeverity = DEBUG_MESSAGE_SEVERITY_ERROR;
-            break;
-
-        case SPV_MSG_WARNING:
-            LevelText   = "warning";
-            MsgSeverity = DEBUG_MESSAGE_SEVERITY_WARNING;
-            break;
-
-        case SPV_MSG_INFO:
-            LevelText   = "info";
-            MsgSeverity = DEBUG_MESSAGE_SEVERITY_INFO;
-            break;
-
-        case SPV_MSG_DEBUG:
-            LevelText   = "debug";
-            MsgSeverity = DEBUG_MESSAGE_SEVERITY_INFO;
-            break;
-    }
-
-    if (level == SPV_MSG_FATAL || level == SPV_MSG_INTERNAL_ERROR || level == SPV_MSG_ERROR || level == SPV_MSG_WARNING)
-        LOG_DEBUG_MESSAGE(MsgSeverity, "Spirv optimizer ", LevelText, ": ", message);
-}
-
 std::vector<unsigned int> HLSLtoSPIRV(const ShaderCreateInfo& ShaderCI,
                                       const char*             ExtraDefinitions,
                                       IDataBlob**             ppCompilerOutput)