Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/msvc_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
platform: "Win32"
toolset: "x64"
build_type: "Debug"
cmake_args: "-DDILIGENT_NO_GLSLANG=ON -DDILIGENT_NO_HLSL=ON"
cmake_args: "-DDILIGENT_NO_GLSLANG=ON -DDILIGENT_NO_HLSL=ON -DDILIGENT_NO_DLSS=ON -DDILIGENT_NO_DSR=ON"
cmake_generator: "Visual Studio 17 2022"

runs-on: windows-2022
Expand Down
2 changes: 1 addition & 1 deletion BuildTools/.NET/dotnet-build-package.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def cmake_build_project(config, settings):
subprocess.run(f"cmake -S . -B {settings['native-build-folder']} \
-D CMAKE_BUILD_TYPE={config} \
-D CMAKE_INSTALL_PREFIX={settings['native-build-folder']}/install -A {settings['cmake-generator-attribute']} \
-D DILIGENT_BUILD_CORE_TESTS=ON", check=True)
-D DILIGENT_BUILD_CORE_TESTS=ON -D DILIGENT_NO_DLSS=ON -D DILIGENT_NO_DSR=ON", check=True)
subprocess.run(f"cmake --build {settings['native-build-folder']} --target install --config {config}", check=True)

native_dll_path = f"{project_paths['dotnet-build']}/{project_paths['dotnet-proj']}/native/{settings['nuget-name-folder']}"
Expand Down
1 change: 1 addition & 0 deletions BuildTools/FormatValidation/validate_format_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ validate_format ../../Common ../../Graphics ../../Platforms ../../Primitives ../
--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h \
--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h \
--exclude ../../Graphics/GraphicsEngineVulkan/shaders \
--exclude ../../Graphics/SuperResolution/shaders \
--exclude ../../Graphics/GraphicsEngine.NET \
--exclude ../../Tests/DiligentCoreAPITest/assets

1 change: 1 addition & 0 deletions BuildTools/FormatValidation/validate_format_mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ python3 clang-format-validate.py --clang-format-executable ./clang-format_mac_10
--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h \
--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h \
--exclude ../../Graphics/GraphicsEngineVulkan/shaders \
--exclude ../../Graphics/SuperResolution/shaders \
--exclude ../../Graphics/GraphicsEngine.NET \
--exclude ../../Tests/DiligentCoreAPITest/assets
1 change: 1 addition & 0 deletions BuildTools/FormatValidation/validate_format_win.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ python clang-format-validate.py --color never --clang-format-executable clang-fo
--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h ^
--exclude ../../Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions_inc.h ^
--exclude ../../Graphics/GraphicsEngineVulkan/shaders ^
--exclude ../../Graphics/SuperResolution/shaders ^
--exclude ../../Graphics/GraphicsEngine.NET ^
--exclude ../../Tests/DiligentCoreAPITest/assets
24 changes: 16 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ set(VULKAN_SUPPORTED FALSE CACHE INTERNAL "Vulkan is not supported")
set(METAL_SUPPORTED FALSE CACHE INTERNAL "Metal is not supported")
set(WEBGPU_SUPPORTED FALSE CACHE INTERNAL "WebGPU is not supported")
set(ARCHIVER_SUPPORTED FALSE CACHE INTERNAL "Archiver is not supported")
set(SUPER_RESOLUTION_SUPPORTED FALSE CACHE INTERNAL "Super resolution is not supported")

set(DILIGENT_CORE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "DiligentCore module source directory")

Expand Down Expand Up @@ -180,10 +181,11 @@ if(MINGW)
endif()

if(PLATFORM_WIN32)
set(GL_SUPPORTED TRUE CACHE INTERNAL "OpenGL is supported on Win32 platform")
set(VULKAN_SUPPORTED TRUE CACHE INTERNAL "Vulkan is supported on Win32 platform")
set(WEBGPU_SUPPORTED TRUE CACHE INTERNAL "WebGPU is supported on Win32 platform")
set(ARCHIVER_SUPPORTED TRUE CACHE INTERNAL "Archiver is supported on Win32 platform")
set(GL_SUPPORTED TRUE CACHE INTERNAL "OpenGL is supported on Win32 platform")
set(VULKAN_SUPPORTED TRUE CACHE INTERNAL "Vulkan is supported on Win32 platform")
set(WEBGPU_SUPPORTED TRUE CACHE INTERNAL "WebGPU is supported on Win32 platform")
set(ARCHIVER_SUPPORTED TRUE CACHE INTERNAL "Archiver is supported on Win32 platform")
set(SUPER_RESOLUTION_SUPPORTED TRUE CACHE INTERNAL "Super resolution is supported on Win32 platform")
target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_WIN32=1)
elseif(PLATFORM_UNIVERSAL_WINDOWS)
set(ARCHIVER_SUPPORTED TRUE CACHE INTERNAL "Archiver is supported on Universal Windows platform")
Expand All @@ -199,12 +201,14 @@ elseif(PLATFORM_LINUX)
set(ARCHIVER_SUPPORTED TRUE CACHE INTERNAL "Archiver is supported on Linux platform")
target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_LINUX=1)
elseif(PLATFORM_MACOS)
set(GL_SUPPORTED TRUE CACHE INTERNAL "OpenGL is supported on MacOS platform")
set(VULKAN_SUPPORTED TRUE CACHE INTERNAL "Vulkan is enabled through MoltenVK on MacOS platform")
set(ARCHIVER_SUPPORTED TRUE CACHE INTERNAL "Archiver is supported on MacOS platform")
set(GL_SUPPORTED TRUE CACHE INTERNAL "OpenGL is supported on MacOS platform")
set(VULKAN_SUPPORTED TRUE CACHE INTERNAL "Vulkan is enabled through MoltenVK on MacOS platform")
set(ARCHIVER_SUPPORTED TRUE CACHE INTERNAL "Archiver is supported on MacOS platform")
set(SUPER_RESOLUTION_SUPPORTED TRUE CACHE INTERNAL "Super resolution is supported on MacOS platform")
target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_MACOS=1 PLATFORM_APPLE=1)
elseif(PLATFORM_IOS)
set(GLES_SUPPORTED TRUE CACHE INTERNAL "OpenGLES is supported on iOS platform")
set(GLES_SUPPORTED TRUE CACHE INTERNAL "OpenGLES is supported on iOS platform")
set(SUPER_RESOLUTION_SUPPORTED TRUE CACHE INTERNAL "Super resolution is supported on iOS platform")
target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_IOS=1 PLATFORM_APPLE=1)
elseif(PLATFORM_TVOS)
target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_TVOS=1 PLATFORM_APPLE=1)
Expand Down Expand Up @@ -303,6 +307,7 @@ else()
option(DILIGENT_NO_WEBGPU "Disable WebGPU backend" ON)
endif()
option(DILIGENT_NO_ARCHIVER "Do not build archiver" OFF)
option(DILIGENT_NO_SUPER_RESOLUTION "Do not build super resolution" OFF)

option(DILIGENT_EMSCRIPTEN_STRIP_DEBUG_INFO "Strip debug information from WebAsm binaries" OFF)

Expand All @@ -329,6 +334,9 @@ endif()
if(${DILIGENT_NO_ARCHIVER})
set(ARCHIVER_SUPPORTED FALSE CACHE INTERNAL "Archiver is forcibly disabled")
endif()
if(${DILIGENT_NO_SUPER_RESOLUTION})
set(SUPER_RESOLUTION_SUPPORTED FALSE CACHE INTERNAL "Super resolution is forcibly disabled")
endif()

if(NOT (${D3D11_SUPPORTED} OR ${D3D12_SUPPORTED} OR ${GL_SUPPORTED} OR ${GLES_SUPPORTED} OR ${VULKAN_SUPPORTED} OR ${METAL_SUPPORTED} OR ${WEBGPU_SUPPORTED}))
message(FATAL_ERROR "No rendering backends are select to build")
Expand Down
4 changes: 4 additions & 0 deletions Graphics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,7 @@ if(ARCHIVER_SUPPORTED)
endif()

add_subdirectory(GraphicsTools)

if(SUPER_RESOLUTION_SUPPORTED)
add_subdirectory(SuperResolution)
endif()
Loading
Loading