[filament] add Filament port

ports/civetweb/usage

@@ -1,4 +1,4 @@
 civetweb provides CMake targets:
 
   find_package(civetweb CONFIG REQUIRED)
-  target_link_libraries(main PRIVATE civetweb::civetweb)
+  target_link_libraries(main PRIVATE civetweb::civetweb civetweb::civetweb-cpp)

ports/civetweb/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "civetweb",
   "version": "1.16",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Easy to use, powerful, C/C++ embeddable web server.",
   "homepage": "https://github.com/civetweb/civetweb",
   "supports": "!uwp",

ports/glslang/0001-private-headers.patch

@@ -0,0 +1,23 @@
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index 47925d8d..47a14adf 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -266,6 +266,15 @@ if(GLSLANG_ENABLE_INSTALL)
+         Include/visibility.h
+         MachineIndependent/Versions.h)
+
++    option(INSTALL_PRIVATE_HEADERS "Install private headers" OFF)
++    if(INSTALL_PRIVATE_HEADERS)
++        foreach(PUBLIC_HEADER IN LISTS GLSLANG_HEADERS GENERICCODEGEN_HEADERS OSDEPENDENT_HEADERS MACHINEINDEPENDENT_HEADERS SPIRV_HEADERS)
++            get_filename_component(PUBLIC_HEADER "${PUBLIC_HEADER}" ABSOLUTE)
++            file(RELATIVE_PATH PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}" "${PUBLIC_HEADER}")
++            list(APPEND PUBLIC_HEADERS "${PUBLIC_HEADER}")
++        endforeach()
++    endif()
++
+     foreach(file ${PUBLIC_HEADERS})
+         get_filename_component(dir ${file} DIRECTORY)
+         install(FILES ${file} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/${dir})
+-- 
+2.45.2
+

ports/glslang/portfile.cmake

@@ -6,6 +6,8 @@ vcpkg_from_github(
     REF "${VERSION}"
     SHA512 8ba7e5f73746b221ff39387282e2d929d1142c60d1c79019f4c21c84b105fb59253e88f2f649a25e9bb7ab01094e455f002c7412aeea882548fac4a426eee809
     HEAD_REF master
+    PATCHES
+        0001-private-headers.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -14,8 +16,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         opt ALLOW_EXTERNAL_SPIRV_TOOLS
         tools ENABLE_GLSLANG_BINARIES
         rtti ENABLE_RTTI
+        "private-headers" INSTALL_PRIVATE_HEADERS
 )
 
+if(INSTALL_PRIVATE_HEADERS)
+    message(WARNING "Avoid relying on the installed private glslang headers.")
+endif()
+
 if(ENABLE_GLSLANG_BINARIES)
     vcpkg_find_acquire_program(PYTHON3)
     get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY)

ports/unofficial-filament/0000-compiler.patch

@@ -0,0 +1,161 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5180bdfb6..471ce49ed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -264,6 +264,9 @@ set(TOOLS ${CMAKE_CURRENT_SOURCE_DIR}/tools)
+ # ==================================================================================================
+ # Compiler check
+ # ==================================================================================================
++option(FILAMENT_ALLOW_ANY_COMPILER "Allow building with any compiler" TRUE)
++
++if(NOT FILAMENT_ALLOW_ANY_COMPILER)
+ set(MIN_CLANG_VERSION "6.0")
+
+ if (CMAKE_C_COMPILER_ID MATCHES "Clang")
+@@ -288,6 +291,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+         message(FATAL_ERROR "Building with Clang on Windows is no longer supported. Use MSVC 2019 instead.")
+     endif()
+ endif()
++endif()
+
+ # ==================================================================================================
+ # Link time optimizations (LTO)
+@@ -306,16 +310,16 @@ endif()
+ # ==================================================================================================
+ # General compiler flags
+ # ==================================================================================================
+-set(CXX_STANDARD "-std=c++17")
+-if (WIN32)
+-    set(CXX_STANDARD "/std:c++17")
+-endif()
++set(CMAKE_CXX_STANDARD 17)
+
+ if (MSVC)
+     set(CXX_STANDARD "/std:c++latest")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} /W0 /Zc:__cplusplus")
+ else()
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} -fstrict-aliasing -Wno-unknown-pragmas -Wno-unused-function -Wno-deprecated-declarations")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas -Wno-unused-function -Wno-deprecated-declarations")
++    if(CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing")
++    endif()
+ endif()
+
+ if (FILAMENT_USE_EXTERNAL_GLES3)
+@@ -361,10 +365,18 @@ if (MSVC)
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE")
+ endif()
+
+-# Add colors to ninja builds
+-if (UNIX AND CMAKE_GENERATOR STREQUAL "Ninja")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
++# Enhance error reporting and compiler messages
++if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
++    add_compile_options(
++        $<$<COMPILE_LANGUAGE:C>:-fcolor-diagnostics> $<$<COMPILE_LANGUAGE:CXX>:-fcolor-diagnostics>
++    )
++elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
++    add_compile_options(
++        $<$<COMPILE_LANGUAGE:C>:-fdiagnostics-color=always>
++        $<$<COMPILE_LANGUAGE:CXX>:-fdiagnostics-color=always>
++    )
++elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER 1900)
++    add_compile_options(/diagnostics:column)
+ endif()
+
+ # Use hidden by default and expose what we need.
+diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt
+index a68d1f915..b2a398c8f 100644
+--- a/filament/CMakeLists.txt
++++ b/filament/CMakeLists.txt
+@@ -604,12 +604,16 @@ if (MSVC)
+ else()
+     set(FILAMENT_WARNINGS
+             -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+-            -Wextra-semi -Wnewline-eof -Wdeprecated -Wundef
++            -Wextra-semi -Wdeprecated -Wundef
++            -Wnon-virtual-dtor -Wimplicit-fallthrough
++    )
++    if(CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
++        list(APPEND FILAMENT_WARNINGS
++            -Wnewline-eof -Wweak-vtables -Wclass-varargs -Wover-aligned
+             -Wgnu-conditional-omitted-operand
+-            -Wweak-vtables -Wnon-virtual-dtor -Wclass-varargs -Wimplicit-fallthrough
+-            -Wover-aligned
+             -Werror
+-    )
++        )
++    endif()
+ endif()
+
+ target_compile_options(${TARGET} PRIVATE
+diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt
+index 28fc07941..3a2d827ff 100644
+--- a/filament/backend/CMakeLists.txt
++++ b/filament/backend/CMakeLists.txt
+@@ -377,12 +377,16 @@ if (MSVC)
+ else()
+     set(FILAMENT_WARNINGS
+             -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+-            -Wextra-semi -Wnewline-eof -Wdeprecated -Wundef
++            -Wextra-semi -Wdeprecated -Wundef
++            -Wnon-virtual-dtor -Wimplicit-fallthrough
++    )
++    if(CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
++        list(APPEND FILAMENT_WARNINGS
++            -Wnewline-eof -Wweak-vtables -Wclass-varargs -Wover-aligned
+             -Wgnu-conditional-omitted-operand
+-            -Wweak-vtables -Wnon-virtual-dtor -Wclass-varargs -Wimplicit-fallthrough
+-            -Wover-aligned
+             -Werror
+-    )
++        )
++    endif()
+ endif()
+
+ if (APPLE)
+diff --git a/filament/backend/src/vulkan/VulkanPipelineCache.cpp b/filament/backend/src/vulkan/VulkanPipelineCache.cpp
+index 4c440a008..b8e3bf5c7 100644
+--- a/filament/backend/src/vulkan/VulkanPipelineCache.cpp
++++ b/filament/backend/src/vulkan/VulkanPipelineCache.cpp
+@@ -280,8 +280,8 @@ void VulkanPipelineCache::bindVertexArray(VkVertexInputAttributeDescription cons
+             mPipelineRequirements.vertexAttributes[i] = attribDesc[i];
+             mPipelineRequirements.vertexBuffers[i] = bufferDesc[i];
+         } else {
+-            mPipelineRequirements.vertexAttributes[i] = {};
+-            mPipelineRequirements.vertexBuffers[i] = {};
++            mPipelineRequirements.vertexAttributes[i] = VertexInputAttributeDescription{};
++            mPipelineRequirements.vertexBuffers[i] = VertexInputBindingDescription{};
+         }
+     }
+ }
+diff --git a/filament/backend/src/vulkan/VulkanStagePool.cpp b/filament/backend/src/vulkan/VulkanStagePool.cpp
+index 067b16afd..f74ea2cb3 100644
+--- a/filament/backend/src/vulkan/VulkanStagePool.cpp
++++ b/filament/backend/src/vulkan/VulkanStagePool.cpp
+@@ -105,7 +105,7 @@ VulkanStageImage const* VulkanStagePool::acquireImage(PixelDataFormat format, Pi
+         .usage = VMA_MEMORY_USAGE_CPU_TO_GPU
+     };
+
+-    const UTILS_UNUSED VkResult result = vmaCreateImage(mAllocator, &imageInfo, &allocInfo,
++    UTILS_UNUSED const VkResult result = vmaCreateImage(mAllocator, &imageInfo, &allocInfo,
+             &image->image, &image->memory, nullptr);
+
+     assert_invariant(result == VK_SUCCESS);
+diff --git a/tools/cso-lut/src/main.cpp b/tools/cso-lut/src/main.cpp
+index b45a60702..e8a7c2bb7 100644
+--- a/tools/cso-lut/src/main.cpp
++++ b/tools/cso-lut/src/main.cpp
+@@ -164,7 +164,7 @@ static float sq(float x) { return x * x; }
+
+ constexpr float PI_F = 3.141592653589793238f;
+
+-static UTILS_UNUSED float sphericalCapsIntersection(float cosCap1, float cosCap2, float cosDistance) {
++UTILS_UNUSED static float sphericalCapsIntersection(float cosCap1, float cosCap2, float cosDistance) {
+     // Oat and Sander 2007, "Ambient Aperture Lighting"
+     float r1 = std::acos(cosCap1);
+     float r2 = std::acos(cosCap2);
+-- 
+2.45.2
+