WIP: fix or silence more warnings

.github/workflows/validation.yml

@@ -2,9 +2,9 @@ name: Validation Build
 
 on:
   push:
-    branches:
-      - 'master'
-      - 'dev'
+#   branches:
+#     - 'master'
+#     - 'dev'
     paths-ignore:
       - '**.md'
       - '**.glsl'

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 include(CMakeDependentOption)
 

cmake/BuildConfig.cmake

@@ -22,3 +22,20 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Choose the type of buil
 
 # Append list of configs for multi-output generators like VS
 list(APPEND CMAKE_CONFIGURATION_TYPES "Develop")
+
+
+# TODO: define GTL_COMPILE_OPTIONS that is then manually set for each target
+# TODO: define GTL_LINK_OPTIONS -> target_link_options (CMake 3.13). e.g. warnings as errors?
+if(MSVC)
+  set(GTL_COMPILE_OPTIONS "")#"/Wall")
+  # Disable "not enough arguments for function-like macro invocation" warning caused
+  # by the transitive inclusion of boost headers and non-conformant MSVC preprocessor
+  # behaviour. See USD's msvcdefaults.cmake file for a detailed comment.
+  set(GTL_COMPILE_OPTIONS "${GTL_COMPILE_OPTIONS}" "/wd4003")
+else()
+  set(GTL_COMPILE_OPTIONS "-Wall" "-Wextra" "-Wformat-security")
+endif()
+
+# TODO: for headers, either use a #pragma OR in case of USD/pxr, add to the target additionally
+
+

extern/CMakeLists.txt

@@ -116,6 +116,7 @@ set(OPENEXR_INSTALL OFF)
 set(OPENEXR_INSTALL_TOOLS OFF)
 set(OPENEXR_INSTALL_EXAMPLES OFF)
 add_subdirectory(openexr)
+target_compile_options(OpenEXR PRIVATE "-Wno-#warnings")
 
 #
 # stb

src/cgpu/CMakeLists.txt

@@ -24,6 +24,12 @@ target_link_libraries(
     spirv-reflect-static
 )
 
+target_compile_options(
+  cgpu
+  PRIVATE
+    ${GTL_COMPILE_OPTIONS}
+)
+
 set_target_properties(
   cgpu
   PROPERTIES

src/cgpu/impl/Cgpu.cpp

@@ -32,6 +32,9 @@
 
 #ifdef __clang__
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wmissing-field-initializers"
 // Silence nullability log spam on AppleClang
 #pragma clang diagnostic ignored "-Wnullability-completeness"
 #endif

src/gb/CMakeLists.txt

@@ -26,6 +26,12 @@ target_link_libraries(
     quill
 )
 
+target_compile_options(
+  gb
+  PRIVATE
+    ${GTL_COMPILE_OPTIONS}
+)
+
 if(GTL_VERBOSE)
   target_compile_definitions(gb PUBLIC GTL_VERBOSE=1)
 endif()

src/ggpu/CMakeLists.txt

@@ -30,6 +30,12 @@ target_link_libraries(
     cgpu
 )
 
+target_compile_options(
+  ggpu
+  PRIVATE
+    ${GTL_COMPILE_OPTIONS}
+)
+
 set_target_properties(
   ggpu
   PROPERTIES

src/ggpu/impl/SyncBuffer.cpp

@@ -53,7 +53,7 @@ namespace gtl
     assert(m_updateStrategy == UpdateStrategy::PersistentMapping || m_deviceBuffer.size() == 0);
   }
 
-  uint8_t* GgpuSyncBuffer::read(uint64_t byteOffset, uint64_t byteSize)
+  uint8_t* GgpuSyncBuffer::read(uint64_t byteOffset, [[maybe_unused]] uint64_t byteSize) // TODO: remove byteSize?
   {
     assert((byteOffset + byteSize) <= m_size);
     return &m_mappedHostMem[byteOffset];

src/gi/CMakeLists.txt

@@ -52,6 +52,12 @@ function(configure_target TARGET)
       SPIRV
   )
 
+  target_compile_options(
+    ${TARGET}
+    PRIVATE
+      ${GTL_COMPILE_OPTIONS}
+  )
+
   if(OpenMP_CXX_FOUND)
     target_link_libraries(${TARGET} PRIVATE OpenMP::OpenMP_CXX)
   endif()

src/gi/impl/Gi.cpp

@@ -2008,7 +2008,7 @@ namespace gtl
     return light;
   }
 
-  void giDestroyDomeLight(GiScene* scene, GiDomeLight* light)
+  void giDestroyDomeLight([[maybe_unused]]/*TODO:use?*/ GiScene* scene, GiDomeLight* light)
   {
     delete light;
   }

src/gi/impl/GlslShaderGen.cpp

@@ -160,7 +160,7 @@ namespace gtl
 
   bool _MakeMaterialGenInfo(const McGlslGenResult& codeGenResult,
                             const std::string& resourcePathPrefix,
-                            fs::path shaderPath,
+                            [[maybe_unused]] fs::path shaderPath, // TODO: remove?
                             GiGlslShaderGen::MaterialGenInfo& genInfo)
   {
     // Append resource path prefix for file-backed MDL modules.

src/gt/CMakeLists.txt

@@ -20,3 +20,9 @@ target_link_libraries(
   PRIVATE
     gb
 )
+
+target_compile_options(
+  gt
+  PRIVATE
+    ${GTL_COMPILE_OPTIONS}
+)

src/hdGatling/CMakeLists.txt

@@ -59,6 +59,12 @@ target_compile_definitions(
     "$<$<OR:$<CONFIG:>,$<CONFIG:Debug>>:TBB_USE_DEBUG>"
 )
 
+target_compile_options(
+  hdGatling
+  PRIVATE
+    ${GTL_COMPILE_OPTIONS}
+)
+
 # Workaround for https://github.com/PixarAnimationStudios/USD/issues/1279
 if(MSVC_VERSION GREATER_EQUAL 1920)
   target_compile_options(hdGatling PRIVATE "/Zc:inline-")

src/hdGatling/light.cpp

@@ -37,7 +37,8 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 namespace
 {
-  float _AreaEllipsoid(const GfMatrix4d& t, float radiusX, float radiusY, float radiusZ)
+//TODO: use transform or remove
+  float _AreaEllipsoid([[maybe_unused]] const GfMatrix4d& t, float radiusX, float radiusY, float radiusZ)
   {
     float ab = powf(radiusX * radiusY, 1.6f);
     float ac = powf(radiusX * radiusZ, 1.6f);

src/hdGatling/mesh.cpp

@@ -248,7 +248,7 @@ namespace
     bitangent = GfVec3f(b, nSign + n[1] * n[1] * a, -n[1]);
   }
 
-  void _CalculateFallbackTangents(const VtVec3iArray& meshFaces,
+  void _CalculateFallbackTangents([[maybe_unused]] const VtVec3iArray& meshFaces, // TODO: remove
                                   const _VertexAttr<GfVec3f>& meshNormals,
                                   VtVec3fArray& meshTangents,
                                   VtFloatArray& meshBitangentSigns)

src/hdGatling/renderPass.cpp

@@ -166,7 +166,7 @@ bool HdGatlingRenderPass::IsConverged() const
 }
 
 void HdGatlingRenderPass::_BakeMeshes(HdRenderIndex* renderIndex,
-                                      GfMatrix4d rootTransform,
+                                      [[maybe_unused]] GfMatrix4d rootTransform, // TODO: remove
                                       std::vector<const GiMaterial*>& materials,
                                       std::vector<const GiMesh*>& meshes,
                                       std::vector<GiMeshInstance>& instances)

src/imgio/CMakeLists.txt

@@ -38,3 +38,9 @@ target_link_libraries(
     OpenEXR::OpenEXR
     stb
 )
+
+target_compile_options(
+  imgio
+  PRIVATE
+    ${GTL_COMPILE_OPTIONS}
+)

src/imgio/impl/ExrDecoder.cpp

@@ -19,10 +19,13 @@
 #include "ErrorCodes.h"
 #include "Image.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
 #include <ImfRgbaFile.h>
 #include <ImfIO.h>
 #include <ImfArray.h>
 #include <ImfRgba.h>
+#pragma clang diagnostic pop
 
 #include <algorithm>
 #include <assert.h>

src/imgio/impl/HdrDecoder.cpp

@@ -19,10 +19,14 @@
 #include "ErrorCodes.h"
 #include "Image.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-function"
 #define STB_IMAGE_IMPLEMENTATION
 #define STBI_FAILURE_USERMSG
 #define STBI_ONLY_HDR
 #include <stb_image.h>
+#pragma clang diagnostic pop
 
 #include <algorithm>
 #include <float.h>

src/mc/CMakeLists.txt

@@ -43,6 +43,12 @@ target_link_libraries(
     MaterialXGenMdl
 )
 
+target_compile_options(
+  mc
+  PRIVATE
+    ${GTL_COMPILE_OPTIONS}
+)
+
 if(DEFINED PXR_VERSION)
   target_compile_definitions(
     mc

src/mc/impl/Backend.cpp

@@ -17,7 +17,14 @@
 
 #include "Backend.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wsign-compare"
 #include <mi/mdl_sdk.h>
+#pragma clang diagnostic pop
 
 #include <cassert>
 #include <array>

src/mc/impl/MdlLogger.cpp

@@ -17,7 +17,13 @@
 
 #include "MdlLogger.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <mi/mdl_sdk.h>
+#pragma clang diagnostic pop
 
 #include <stdio.h>
 #include <gtl/gb/Log.h>

src/mc/impl/MdlLogger.h

@@ -17,9 +17,15 @@
 
 #pragma once
 
+#pragma clang diagnostic push
+//#pragma clang diagnostic ignored "-Wdeprecated-copy"
+//#pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <mi/base/interface_implement.h>
 #include <mi/base/ilogger.h>
 #include <mi/neuraylib/imdl_execution_context.h>
+#pragma clang diagnostic pop
 
 namespace gtl
 {

src/mc/impl/MdlMaterialCompiler.cpp

@@ -21,7 +21,12 @@
 
 #include <gtl/gb/Fmt.h>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <mi/mdl_sdk.h>
+#pragma clang diagnostic pop
 
 #include <atomic>
 #include <cassert>

src/mc/impl/MdlMaterialCompiler.h

@@ -22,6 +22,10 @@
 #include <vector>
 #include <mutex>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <mi/base/handle.h>
 #include <mi/neuraylib/icompiled_material.h>
 #include <mi/neuraylib/idatabase.h>
@@ -31,6 +35,7 @@
 #include <mi/neuraylib/imdl_execution_context.h>
 #include <mi/neuraylib/imdl_factory.h>
 #include <mi/neuraylib/imdl_impexp_api.h>
+#pragma clang diagnostic pop
 
 #include "MdlLogger.h"
 

src/mc/impl/MdlNeurayLoader.cpp

@@ -17,7 +17,12 @@
 
 #include "MdlNeurayLoader.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <mi/mdl_sdk.h>
+#pragma clang diagnostic pop
 
 #ifdef MI_PLATFORM_WINDOWS
 #include <mi/base/miwindows.h>

src/mc/impl/MdlNeurayLoader.h

@@ -17,8 +17,12 @@
 
 #pragma once
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <mi/base/handle.h>
 #include <mi/neuraylib/ineuray.h>
+#pragma clang diagnostic pop
 
 #include <string_view>
 

src/mc/impl/MdlRuntime.cpp

@@ -20,7 +20,10 @@
 #include "MdlLogger.h"
 #include "MdlNeurayLoader.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy"
 #include <mi/mdl_sdk.h>
+#pragma clang diagnostic pop
 
 namespace gtl
 {

src/mc/impl/MdlRuntime.h

@@ -17,6 +17,10 @@
 
 #pragma once
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <mi/base/handle.h>
 #include <mi/neuraylib/ineuray.h>
 #include <mi/neuraylib/idatabase.h>
@@ -25,6 +29,7 @@
 #include <mi/neuraylib/imdl_backend_api.h>
 #include <mi/neuraylib/imdl_impexp_api.h>
 #include <mi/neuraylib/imdl_factory.h>
+#pragma clang diagnostic pop
 
 #include <memory>
 #include <string_view>