add suport for descriptor indexing

CMakeLists.txt

@@ -29,7 +29,7 @@ option(GFX_BUILD_TESTS    "Build the tests"                     OFF)
 option(GFX_INSTALL        "Enable the install command"           ON)
 
 if(GFX_BUILD_EXAMPLES)
-    set(GFX_EXAMPLES_TO_BUILD "triangle;multiBuffer;imgui_usage;mc_cube;scop" CACHE STRING "Semicolon separated list of example names to build")
+    set(GFX_EXAMPLES_TO_BUILD "triangle;multiBuffer;descriptor_indexing;imgui_usage;mc_cube;scop" CACHE STRING "Semicolon separated list of example names to build")
 endif()
 
 enable_language(CXX)

examples/CMakeLists.txt

@@ -12,6 +12,9 @@ if (GFX_ENABLE_GLFW)
     if ("multiBuffer" IN_LIST GFX_EXAMPLES_TO_BUILD)
         add_subdirectory(multiBuffer)
     endif()
+    if ("descriptor_indexing" IN_LIST GFX_EXAMPLES_TO_BUILD)
+        add_subdirectory(descriptor_indexing)
+    endif()
     if (GFX_ENABLE_IMGUI)
         if ("imgui_usage" IN_LIST GFX_EXAMPLES_TO_BUILD)
             add_subdirectory(imgui_usage)

examples/descriptor_indexing/CMakeLists.txt

@@ -0,0 +1,130 @@
+# ---------------------------------------------------
+# CMakeLists.txt
+#
+# Author: Thomas Choquet <semoir.dense-0h@icloud.com>
+# ---------------------------------------------------
+
+include(FetchContent)
+
+## GLFW ##########################################################
+
+FetchContent_Declare(glfw3
+    GIT_REPOSITORY    https://github.com/glfw/glfw.git
+    GIT_TAG           3.4
+    GIT_SHALLOW       1
+    GIT_PROGRESS      TRUE
+    FIND_PACKAGE_ARGS
+)
+set(GLFW_BUILD_TESTS    OFF)
+set(GLFW_BUILD_DOCS     OFF)
+set(GLFW_INSTALL        OFF)
+set(GLFW_BUILD_EXAMPLES OFF)
+if(NOT GLFW_BUILD_WAYLAND)
+    set(GLFW_BUILD_WAYLAND OFF)
+endif()
+if (APPLE)
+    enable_language(OBJC)
+endif()
+FetchContent_MakeAvailable(glfw3)
+if (glfw3_SOURCE_DIR)
+    if (TARGET update_mappings)
+        set_target_properties(glfw PROPERTIES FOLDER "dependencies/GLFW3")
+        set_target_properties(update_mappings PROPERTIES FOLDER "dependencies/GLFW3")
+    else()
+        set_target_properties(glfw PROPERTIES FOLDER "dependencies")
+    endif()
+endif()
+
+## GLM ###############################################################
+
+FetchContent_Declare(gml
+    GIT_REPOSITORY    https://github.com/g-truc/glm.git
+    GIT_TAG           1.0.1
+    GIT_SHALLOW       1
+    GIT_PROGRESS      TRUE
+    FIND_PACKAGE_ARGS NAMES glm
+)
+FetchContent_MakeAvailable(gml)
+if (gml_SOURCE_DIR)
+    set_target_properties(glm PROPERTIES FOLDER "dependencies")
+endif()
+
+##################################################################
+
+set(SHADER_TARGET_LIST)
+if (GFX_BUILD_METAL)
+    list(APPEND SHADER_TARGET_LIST metal)
+endif()
+if (GFX_BUILD_VULKAN)
+    list(APPEND SHADER_TARGET_LIST spirv)
+endif()
+list(JOIN SHADER_TARGET_LIST "," SHADER_TARGETS)
+
+set(SHADER_SLIB "${CMAKE_CURRENT_BINARY_DIR}/shader.slib")
+file(GLOB SHADER_SRCS "*.slang")
+
+add_custom_command(
+    OUTPUT ${SHADER_SLIB}
+    COMMAND $<TARGET_FILE:gfxsc> -t ${SHADER_TARGETS} -o ${SHADER_SLIB} ${SHADER_SRCS}
+    DEPENDS gfxsc ${SHADER_SRCS}
+    COMMENT "Building descriptor_indexing shader"
+    VERBATIM
+)
+add_custom_target(descriptor_indexing_shader ALL DEPENDS ${SHADER_SLIB})
+set_target_properties(descriptor_indexing_shader PROPERTIES FOLDER "examples/descriptor_indexing")
+
+add_executable(descriptor_indexing)
+
+if (APPLE)
+    enable_language(OBJC)
+endif()
+
+set_target_properties(descriptor_indexing PROPERTIES
+    FOLDER         "examples/descriptor_indexing"
+    ENABLE_EXPORTS ON
+)
+
+target_compile_features(descriptor_indexing PRIVATE cxx_std_23)
+
+if(MSVC)
+    target_compile_options(descriptor_indexing PRIVATE /W4)
+else()
+    target_compile_options(descriptor_indexing PRIVATE -Wall -Wextra -Wpedantic)
+    target_compile_options(descriptor_indexing PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wno-missing-field-initializers>)
+endif()
+
+file(GLOB EXE_SRCS "*.cpp" "*.hpp")
+target_sources(descriptor_indexing PRIVATE ${EXE_SRCS})
+if (WIN32)
+    target_sources(descriptor_indexing PRIVATE descriptor_indexing.def)
+endif()
+
+target_include_directories(descriptor_indexing PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+target_compile_definitions(descriptor_indexing PRIVATE "SHADER_SLIB=\"${SHADER_SLIB}\"")
+if(CMAKE_GENERATOR STREQUAL "Xcode")
+    target_compile_definitions(descriptor_indexing PRIVATE "__XCODE__")
+endif()
+target_compile_definitions(descriptor_indexing PRIVATE "GLFW_INCLUDE_NONE")
+
+target_link_libraries(descriptor_indexing PRIVATE Graphics glfw glm::glm)
+add_dependencies(descriptor_indexing descriptor_indexing_shader)
+
+if(APPLE AND NOT CMAKE_GENERATOR STREQUAL "Xcode")
+    set(CODESIGN_IDENTITY "-" CACHE STRING "Codesigning identity for descriptor_indexing")
+
+    set(DESCRIPTOR_INDEXING_ENTITLEMENTS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/descriptor_indexing.entitlements")
+    if(EXISTS "${DESCRIPTOR_INDEXING_ENTITLEMENTS_FILE}")
+        add_custom_command(TARGET descriptor_indexing POST_BUILD
+            COMMAND /bin/sh -c "codesign --sign \"${CODESIGN_IDENTITY}\" --force --entitlements \"${DESCRIPTOR_INDEXING_ENTITLEMENTS_FILE}\" \"$<TARGET_FILE:descriptor_indexing>\" >/dev/null 2>&1"
+            COMMENT "Codesigning descriptor_indexing (with entitlements) [identity: ${CODESIGN_IDENTITY}]"
+            VERBATIM
+        )
+    else()
+        add_custom_command(TARGET descriptor_indexing POST_BUILD
+            COMMAND /bin/sh -c "codesign --sign \"${CODESIGN_IDENTITY}\" --force \"$<TARGET_FILE:descriptor_indexing>\" >/dev/null 2>&1"
+            COMMENT "Codesigning descriptor_indexing [identity: ${CODESIGN_IDENTITY}]"
+            VERBATIM
+        )
+    endif()
+endif()