id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 07:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed building for Vulkan on Linux

Browse source
This commit is contained in:
Robert Beckebans 2021-04-30 11:42:20 +02:00
parent b67612c67c
commit 8ae5bace37
2 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
neo/CMakeLists.txt
View file

@ -76,8 +76,18 @@ if(FFMPEG AND BINKDEC)
message(FATAL_ERROR "Only one of FFMPEG and BINKDEC (or neither) can be enabled at a time")
endif()
if(UNIX)
set(OPENAL TRUE)
set(OPENAL ON)
if(USE_VULKAN)
SET(SDL2 ON)
# RB: disable precompiled headers on Linux with Vulkan because of error: POSIX thread support was disabled in PCH file but is currently enabled
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
set(USE_PRECOMPILED_HEADERS OFF)
endif()
endif()
endif()
if(COMPILE_COMMANDS)
@ -93,12 +103,7 @@ if (FORCE_COLOR_OUTPUT)
endif ()
endif ()
# Eric: Hard dependency on SDL2 for the Vulkan renderer on Linux
if(UNIX)
if(USE_VULKAN)
SET(SDL2 ON)
endif()
endif()
if(MSVC)
#message(STATUS CMAKE_ROOT: ${CMAKE_ROOT})
@ -159,13 +164,12 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_CO
#endif()
# SRS - Change add_compile_options to add_definitions so options propagate to pre-compiled header build settings
add_definitions(-Wno-pragmas -Wno-unused-variable -Wno-switch -Wno-unused-value -Winvalid-pch -Wno-multichar)
add_compile_options(-Wno-pragmas -Wno-unused-variable -Wno-switch -Wno-unused-value -Winvalid-pch -Wno-multichar)
# SRS - Add test for AppleClang
if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
# add clang-specific settings for warnings (the second one make sure clang doesn't complain
# about unknown -W flags, like -Wno-unused-but-set-variable)
# SRS - Add -Wno-deprecated-register and -Wno-expansion-to-defined to list of warning settings
add_definitions(-Wno-local-type-template-args -Wno-unknown-warning-option -Wno-inline-new-delete -Wno-switch-enum -Wno-deprecated-register -Wno-expansion-to-defined)
add_compile_options(-Wno-local-type-template-args -Wno-unknown-warning-option -Wno-inline-new-delete -Wno-switch-enum)
endif()
if(NOT CMAKE_CROSSCOMPILING AND ONATIVE)
@ -176,8 +180,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_CO
endif()
endif()
# SRS - Change add_compile_options to add_definitions so options propagate to pre-compiled header build settings
add_definitions(-fno-strict-aliasing)
add_compile_options(-fno-strict-aliasing)
# SRS - Make sure OSX can find system headers and add support for minimum OSX runtime version
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@ -1669,9 +1672,6 @@ else()
list(APPEND RBDOOM3_SOURCES
${SYS_INCLUDES} ${SYS_SOURCES})
find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIRS})
if(UNIX)
if(FFMPEG)
find_package(FFMPEG REQUIRED)
@ -1745,6 +1745,9 @@ else()
endif()
else()
find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIRS})
list(APPEND RBDOOM3_INCLUDES ${RENDERER_OPENGL_INCLUDES})
list(APPEND RBDOOM3_SOURCES ${RENDERER_OPENGL_SOURCES})
endif()

25
neo/renderer/Vulkan/Allocator_VK.cpp
View file

@ -496,9 +496,15 @@ void idVulkanBlock::Print()
idLib::Printf( "Type Index: %u\n", memoryTypeIndex );
idLib::Printf( "Usage: %s\n", memoryUsageStrings[ usage ] );
idLib::Printf( "Count: %d\n", count );
//SRS - Changed %lu to %llu
// RB: FIXME different sizes of VulkanDeviceSize on different platforms?
#if defined(__APPLE__)
idLib::Printf( "Size: %llu\n", size );
idLib::Printf( "Allocated: %llu\n", allocated );
#else
idLib::Printf( "Size: %lu\n", size );
idLib::Printf( "Allocated: %lu\n", allocated );
#endif
idLib::Printf( "Next Block: %u\n", nextBlockId );
idLib::Printf( "------------------------\n" );
@ -507,9 +513,13 @@ void idVulkanBlock::Print()
idLib::Printf( "{\n" );
idLib::Printf( "\tId: %u\n", current->id );
//SRS - Changed %lu to %llu
#if defined(__APPLE__)
idLib::Printf( "\tSize: %llu\n", current->size );
idLib::Printf( "\tOffset: %llu\n", current->offset );
#else
idLib::Printf( "\tSize: %lu\n", current->size );
idLib::Printf( "\tOffset: %lu\n", current->offset );
#endif
idLib::Printf( "\tType: %s\n", allocationTypeStrings[ current->type ] );
idLib::Printf( "}\n" );
@ -682,8 +692,11 @@ void idVulkanAllocator::Print()
{
idLib::Printf( "Device Local MB: %d\n", int( deviceLocalMemoryBytes / 1024 * 1024 ) );
idLib::Printf( "Host Visible MB: %d\n", int( hostVisibleMemoryBytes / 1024 * 1024 ) );
//SRS - Changed %lu to %llu
#if defined(__APPLE__)
idLib::Printf( "Buffer Granularity: %llu\n", bufferImageGranularity );
#else
idLib::Printf( "Buffer Granularity: %lu\n", bufferImageGranularity );
#endif
idLib::Printf( "\n" );
for( int i = 0; i < VK_MAX_MEMORY_TYPES; ++i )
@ -706,8 +719,12 @@ CONSOLE_COMMAND( Vulkan_PrintHeapInfo, "Print out the heap information for this
for( uint32 i = 0; i < props.memoryHeapCount; ++i )
{
VkMemoryHeap heap = props.memoryHeaps[ i ];
//SRS - Changed %lu to %llu
#if defined(__APPLE__)
idLib::Printf( "id=%d, size=%llu, flags=", i, heap.size );
#else
idLib::Printf( "id=%d, size=%lu, flags=", i, heap.size );
#endif
if( heap.flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT )
{
idLib::Printf( "DEVICE_LOCAL" );