falso
/
FITD
mirror of https://github.com/yaz0r/FITD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modernize BGFX

This commit is contained in:
yaz0r 2025-06-02 23:07:03 -07:00
parent 437478b6a7
commit c86ddb26a3
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -20,4 +20,4 @@ set(ZLIB_TESTS OFF CACHE BOOL "Build zlib tests")
add_subdirectory(${THIRD_PARTY}/zlib ${CMAKE_BINARY_DIR}/zlib/zlib-build) add_subdirectory(${THIRD_PARTY}/zlib ${CMAKE_BINARY_DIR}/zlib/zlib-build)
add_subdirectory( FitdLib ) add_subdirectory( FitdLib )
add_subdirectory( Fitd ) add_subdirectory( Fitd )

13
FitdLib/CMakeLists.txt
View File

@ -50,8 +50,8 @@ function(assign_source_group)
endfunction(assign_source_group) endfunction(assign_source_group)
macro(addShaderProgramPermutation vsname psname varyingname platform api profileVS profilePS) macro(addShaderProgramPermutation vsname psname varyingname platform api profileVS profilePS)
shaderc(FILE shaders/${vsname}.sc BIN2C ${vsname}_${api} OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/shaders/generated/${vsname}_${api}.h VERTEX ${platform} VARYINGDEF shaders/${varyingname}.sc INCLUDES ${BGFX_DIR}/src PROFILE ${profileVS}) _bgfx_shaderc_parse(CLI FILE shaders/${vsname}.sc BIN2C ${vsname}_${api} OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/shaders/generated/${vsname}_${api}.h VERTEX ${platform} VARYINGDEF shaders/${varyingname}.sc INCLUDES ${BGFX_DIR}/src PROFILE ${profileVS})
shaderc(FILE shaders/${psname}.sc BIN2C ${psname}_${api} OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/shaders/generated/${psname}_${api}.h FRAGMENT ${platform} VARYINGDEF shaders/${varyingname}.sc INCLUDES ${BGFX_DIR}/src PROFILE ${profilePS}) _bgfx_shaderc_parse(CLI FILE shaders/${psname}.sc BIN2C ${psname}_${api} OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/shaders/generated/${psname}_${api}.h FRAGMENT ${platform} VARYINGDEF shaders/${varyingname}.sc INCLUDES ${BGFX_DIR}/src PROFILE ${profilePS})
#shaderc(FILE shaders/${vsname}.sc BIN2C ${vsname}_${api} OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/shaders/generated/${vsname}_${api}.debug.h DEBUG VERTEX ${platform} VARYINGDEF shaders/${varyingname}.sc INCLUDES ${BGFX_DIR}/src PROFILE ${profileVS}) #shaderc(FILE shaders/${vsname}.sc BIN2C ${vsname}_${api} OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/shaders/generated/${vsname}_${api}.debug.h DEBUG VERTEX ${platform} VARYINGDEF shaders/${varyingname}.sc INCLUDES ${BGFX_DIR}/src PROFILE ${profileVS})
#shaderc(FILE shaders/${psname}.sc BIN2C ${psname}_${api} OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/shaders/generated/${psname}_${api}.debug.h DEBUG FRAGMENT ${platform} VARYINGDEF shaders/${varyingname}.sc INCLUDES ${BGFX_DIR}/src PROFILE ${profilePS}) #shaderc(FILE shaders/${psname}.sc BIN2C ${psname}_${api} OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/shaders/generated/${psname}_${api}.debug.h DEBUG FRAGMENT ${platform} VARYINGDEF shaders/${varyingname}.sc INCLUDES ${BGFX_DIR}/src PROFILE ${profilePS})
set(SOURCES set(SOURCES
@ -104,4 +104,13 @@ addShaderProgram(sphere_vs sphere_ps sphere.varying.def)
assign_source_group(${SOURCES}) assign_source_group(${SOURCES})
if(MSVC)
add_compile_options(/Zc:__cplusplus)
add_compile_options(/Zc:preprocessor)
endif()
add_library (FitdLib ${SOURCES}) add_library (FitdLib ${SOURCES})
target_compile_definitions( FitdLib PUBLIC "BX_CONFIG_DEBUG=0" )
set_property(TARGET FitdLib PROPERTY CXX_STANDARD 20)

4
FitdLib/imguiBGFX.cpp
View File

@ -490,13 +490,13 @@ static OcornutImguiContext s_ctx;
static void* memAlloc(size_t _size, void* _userData) static void* memAlloc(size_t _size, void* _userData)
{ {
BX_UNUSED(_userData); BX_UNUSED(_userData);
return BX_ALLOC(s_ctx.m_allocator, _size); return bx::alloc(s_ctx.m_allocator, _size);
} }
static void memFree(void* _ptr, void* _userData) static void memFree(void* _ptr, void* _userData)
{ {
BX_UNUSED(_userData); BX_UNUSED(_userData);
BX_FREE(s_ctx.m_allocator, _ptr); bx::free(s_ctx.m_allocator, _ptr);
} }
void imguiCreate(float _fontSize, bx::AllocatorI* _allocator) void imguiCreate(float _fontSize, bx::AllocatorI* _allocator)

2
ThirdParty/bgfx.cmake vendored

@ -1 +1 @@
Subproject commit 417f8b82ef76ef19a0f3efd93d32088c9b3331a0 Subproject commit 657dd625515d6324a82b734c1e6f81e08cf1f1ee