id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 02:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix PCH build failures (on linux) when USE_VMA allocator option enabled

Browse source
This commit is contained in:
Stephen Saunders 2023-02-15 23:00:50 -05:00
parent 86a6e486d5
commit 8ac44895e1
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
neo/CMakeLists.txt
View file

@ -1603,6 +1603,9 @@ if(MSVC)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
if(USE_VULKAN AND USE_VMA)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sys/DeviceManager_VK.cpp)
endif()
#foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
# message(STATUS "-include precompiled.h for ${src_file}")
@ -1754,6 +1757,9 @@ else()
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
if(USE_VULKAN AND USE_VMA)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sys/DeviceManager_VK.cpp)
endif()
foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
#message(STATUS "-include precompiled.h for ${src_file}")

1
neo/renderer/BufferObject.h
View file

@ -38,6 +38,7 @@ If you have questions concerning this license or the applicable additional terms
#include <nvrhi/nvrhi.h>
#if defined( USE_AMD_ALLOCATOR )
#include <nvrhi/vulkan.h>
#include "vk_mem_alloc.h"
#endif
#endif

4
neo/renderer/Image.h
View file

@ -288,10 +288,6 @@ typedef void ( *ImageGeneratorFunction )( idImage* image, nvrhi::ICommandList* c
#include "BinaryImage.h"
#if defined( USE_AMD_ALLOCATOR )
#include "vk_mem_alloc.h"
#endif
#define MAX_IMAGE_NAME 256
class idImage

3
neo/sys/DeviceManager_VK.cpp
View file

@ -20,8 +20,11 @@
* DEALINGS IN THE SOFTWARE.
*/
// SRS - Disable PCH for USE_AMD_ALLOCATOR option, otherwise get Vulkan header mismatch failures
#if !defined( USE_AMD_ALLOCATOR )
#include <precompiled.h>
#pragma hdrstop
#endif
#include <string>
#include <queue>