Rebrand to XenosRecomp.

This commit is contained in:
Skyth 2025-01-19 22:37:35 +03:00
parent 66c618cc72
commit ab277869d4
13 changed files with 25 additions and 25 deletions

View file

@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.20)
include($ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake) include($ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
project("ShaderRecomp-ALL") project("XenosRecomp-ALL")
set(SHADER_RECOMP_THIRDPARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty") set(XENOS_RECOMP_THIRDPARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty")
add_subdirectory(${SHADER_RECOMP_THIRDPARTY_ROOT}) add_subdirectory(${XENOS_RECOMP_THIRDPARTY_ROOT})
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ShaderRecomp") add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/XenosRecomp")

View file

@ -1,12 +1,12 @@
project(ShaderRecomp) project(XenosRecomp)
if (WIN32) if (WIN32)
option(SHADER_RECOMP_DXIL "Generate DXIL shader cache" ON) option(XENOS_RECOMP_DXIL "Generate DXIL shader cache" ON)
endif() endif()
set(SMOLV_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty/smol-v/source") set(SMOLV_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty/smol-v/source")
add_executable(ShaderRecomp add_executable(XenosRecomp
constant_table.h constant_table.h
dxc_compiler.cpp dxc_compiler.cpp
dxc_compiler.h dxc_compiler.h
@ -20,27 +20,27 @@ add_executable(ShaderRecomp
find_package(directx-dxc CONFIG REQUIRED) find_package(directx-dxc CONFIG REQUIRED)
target_link_libraries(ShaderRecomp PRIVATE target_link_libraries(XenosRecomp PRIVATE
Microsoft::DirectXShaderCompiler Microsoft::DirectXShaderCompiler
Microsoft::DXIL Microsoft::DXIL
xxHash::xxhash xxHash::xxhash
libzstd_static libzstd_static
fmt::fmt) fmt::fmt)
target_include_directories(ShaderRecomp PRIVATE ${SMOLV_SOURCE_DIR}) target_include_directories(XenosRecomp PRIVATE ${SMOLV_SOURCE_DIR})
target_precompile_headers(ShaderRecomp PRIVATE pch.h) target_precompile_headers(XenosRecomp PRIVATE pch.h)
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(ShaderRecomp PRIVATE -Wno-switch -Wno-unused-variable -Wno-null-arithmetic -fms-extensions) target_compile_options(XenosRecomp PRIVATE -Wno-switch -Wno-unused-variable -Wno-null-arithmetic -fms-extensions)
endif() endif()
if (WIN32) if (WIN32)
target_compile_definitions(ShaderRecomp PRIVATE _CRT_SECURE_NO_WARNINGS) target_compile_definitions(XenosRecomp PRIVATE _CRT_SECURE_NO_WARNINGS)
find_file(DIRECTX_DXIL_LIBRARY "dxil.dll") find_file(DIRECTX_DXIL_LIBRARY "dxil.dll")
file(COPY ${DIRECTX_DXIL_LIBRARY} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY ${DIRECTX_DXIL_LIBRARY} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
endif() endif()
if (SHADER_RECOMP_DXIL) if (XENOS_RECOMP_DXIL)
target_compile_definitions(ShaderRecomp PRIVATE SHADER_RECOMP_DXIL) target_compile_definitions(XenosRecomp PRIVATE XENOS_RECOMP_DXIL)
endif() endif()

View file

@ -32,24 +32,24 @@ struct RecompiledShader
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
const char* input = const char* input =
#ifdef SHADER_RECOMP_INPUT #ifdef XENOS_RECOMP_INPUT
SHADER_RECOMP_INPUT XENOS_RECOMP_INPUT
#else #else
argv[1] argv[1]
#endif #endif
; ;
const char* output = const char* output =
#ifdef SHADER_RECOMP_OUTPUT #ifdef XENOS_RECOMP_OUTPUT
SHADER_RECOMP_OUTPUT XENOS_RECOMP_OUTPUT
#else #else
argv[2] argv[2]
#endif #endif
; ;
const char* includeInput = const char* includeInput =
#ifdef SHADER_RECOMP_INCLUDE_INPUT #ifdef XENOS_RECOMP_INCLUDE_INPUT
SHADER_RECOMP_INCLUDE_INPUT XENOS_RECOMP_INCLUDE_INPUT
#else #else
argv[3] argv[3]
#endif #endif
@ -114,7 +114,7 @@ int main(int argc, char** argv)
thread_local DxcCompiler dxcCompiler; thread_local DxcCompiler dxcCompiler;
#ifdef SHADER_RECOMP_DXIL #ifdef XENOS_RECOMP_DXIL
shader.dxil = dxcCompiler.compile(recompiler.out, recompiler.isPixelShader, recompiler.specConstantsMask != 0, false); shader.dxil = dxcCompiler.compile(recompiler.out, recompiler.isPixelShader, recompiler.specConstantsMask != 0, false);
assert(shader.dxil != nullptr); assert(shader.dxil != nullptr);
assert(*(reinterpret_cast<uint32_t *>(shader.dxil->GetBufferPointer()) + 1) != 0 && "DXIL was not signed properly!"); assert(*(reinterpret_cast<uint32_t *>(shader.dxil->GetBufferPointer()) + 1) != 0 && "DXIL was not signed properly!");
@ -162,7 +162,7 @@ int main(int argc, char** argv)
int level = ZSTD_maxCLevel(); int level = ZSTD_maxCLevel();
#ifdef SHADER_RECOMP_DXIL #ifdef XENOS_RECOMP_DXIL
std::vector<uint8_t> dxilCompressed(ZSTD_compressBound(dxil.size())); std::vector<uint8_t> dxilCompressed(ZSTD_compressBound(dxil.size()));
dxilCompressed.resize(ZSTD_compress(dxilCompressed.data(), dxilCompressed.size(), dxil.data(), dxil.size(), level)); dxilCompressed.resize(ZSTD_compress(dxilCompressed.data(), dxilCompressed.size(), dxil.data(), dxil.size(), level));

View file

@ -1,11 +1,11 @@
if (NOT TARGET fmt::fmt) if (NOT TARGET fmt::fmt)
add_subdirectory("${SHADER_RECOMP_THIRDPARTY_ROOT}/fmt") add_subdirectory("${XENOS_RECOMP_THIRDPARTY_ROOT}/fmt")
endif() endif()
if (NOT TARGET xxHash::xxhash) if (NOT TARGET xxHash::xxhash)
add_subdirectory("${SHADER_RECOMP_THIRDPARTY_ROOT}/xxHash/cmake_unofficial") add_subdirectory("${XENOS_RECOMP_THIRDPARTY_ROOT}/xxHash/cmake_unofficial")
endif() endif()
if (NOT TARGET libzstd) if (NOT TARGET libzstd)
add_subdirectory("${SHADER_RECOMP_THIRDPARTY_ROOT}/zstd/build/cmake") add_subdirectory("${XENOS_RECOMP_THIRDPARTY_ROOT}/zstd/build/cmake")
endif() endif()