Merge remote-tracking branch 'upstream/master' into for-0.56.0/sync

Author: VReaperV

CMakeLists.txt

@@ -506,12 +506,6 @@ if (DEPS_DIR)
         set(CMAKE_FRAMEWORK_PATH ${DEPS_DIR} ${CMAKE_FRAMEWORK_PATH} PARENT_SCOPE)
         set(CMAKE_PREFIX_PATH ${DEPS_DIR} ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
     endif()
-
-    # Force OpenAL Soft on Mac, otherwise the system framework will be selected
-    if (APPLE)
-        set(OPENAL_INCLUDE_DIR ${DEPS_DIR}/include/AL)
-        set(OPENAL_LIBRARY ${DEPS_DIR}/lib/libopenal.dylib)
-    endif()
 endif()
 
 # These variables are defined:
@@ -822,7 +816,10 @@ if (BUILD_CLIENT)
     include_directories(${GLEW_INCLUDE_DIR})
     set(LIBS_CLIENT ${LIBS_CLIENT} ${GLEW_LIBRARIES})
 
+    set(backup_find_framework ${CMAKE_FIND_FRAMEWORK})
+    set(CMAKE_FIND_FRAMEWORK NEVER) # Mac's system OpenAL doesn't have efx.h
     find_package(OpenAL REQUIRED)
+    set(CMAKE_FIND_FRAMEWORK ${backup_find_framework})
     include_directories(${OPENAL_INCLUDE_DIR})
     set(LIBS_CLIENT ${LIBS_CLIENT} ${OPENAL_LIBRARY})
 endif()

README.md

@@ -4,7 +4,7 @@ Dæmon is the standalone engine that powers the multiplayer first person shooter
 
 [![GitHub tag](https://img.shields.io/github/tag/DaemonEngine/Daemon.svg)](https://github.com/DaemonEngine/Daemon/tags)
 
-[![IRC](https://img.shields.io/badge/irc-%23daemon--engine%2C%23unvanquished--dev-4cc51c.svg)](https://web.libera.chat/#daemon-engine,#unvanquished-dev)
+[![IRC](https://img.shields.io/badge/irc-%23unvanquished--dev-9cf.svg)](https://web.libera.chat/#unvanquished-dev)
 
 | Windows | macOS | Linux |
 |---------|-----|-------|
@@ -124,4 +124,4 @@ If you want to run a dedicated server, you may want to use the non-graphical `da
 ./daemonded +map <mapname>
 ```
 
-Map names and other options may be [specific to the game](https://github.com/Unvanquished/Unvanquished#configuring-the-server).
+Map names and other options may be [specific to the game](https://github.com/Unvanquished/Unvanquished#configuring-the-server).

azure-pipelines.yml

@@ -68,18 +68,21 @@ jobs:
     strategy:
       matrix:
         GCC:
+          BUILD_TYPE: Release
           C_COMPILER: gcc
           CXX_COMPILER: g++
           EXTRA_PACKAGES:
           EXTRA_INSTALLS:
           TOOLCHAIN_FILE:
         Clang:
+          BUILD_TYPE: Release
           C_COMPILER: clang
           CXX_COMPILER: clang++
           EXTRA_PACKAGES:
           EXTRA_INSTALLS:
           TOOLCHAIN_FILE:
         Mingw:
+          BUILD_TYPE: Debug
           C_COMPILER: x86_64-w64-mingw32-gcc
           CXX_COMPILER: x86_64-w64-mingw32-g++
           EXTRA_PACKAGES: gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64-x86-64-dev
@@ -120,7 +123,7 @@ jobs:
     - bash: |
         set -e
         cmake --version
-        cmake -G "Ninja" -Wdev -Wdeprecated -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -DBUILD_DUMMY_APP=1 -DBUILD_TESTS=1 -DCMAKE_BUILD_TYPE=Release -H. -Bbuild
+        cmake -G "Ninja" -Wdev -Wdeprecated -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -DBUILD_DUMMY_APP=1 -DBUILD_TESTS=1 -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -H. -Bbuild
         cmake --build build -- -j`nproc`
       displayName: 'Build'
     - bash: |

cmake/DaemonArchitecture.cmake

@@ -75,17 +75,20 @@ add_definitions(-DARCH_STRING=${ARCH})
 
 # Modifying NACL_ARCH breaks engine compatibility with nexe game binaries
 # since NACL_ARCH contributes to the nexe file name.
-set(ARMHF_USAGE arm64 armel)
-if(ARCH IN_LIST ARMHF_USAGE)
-	if (LINUX OR FREEBSD)
+set(NACL_ARCH "${ARCH}")
+if (LINUX OR FREEBSD)
+	set(ARMHF_USAGE arm64 armel)
+	if (ARCH IN_LIST ARMHF_USAGE)
 		# Load 32-bit armhf nexe on 64-bit arm64 engine on Linux with multiarch.
 		# The nexe is system agnostic so there should be no difference with armel.
 		set(NACL_ARCH "armhf")
-	else()
-		message(FATAL_ERROR "${ARCH} architecture is not supported on this system")
 	endif()
-else()
-	set(NACL_ARCH "${ARCH}")
+elseif(APPLE)
+	if ("${ARCH}" STREQUAL arm64)
+		# You can get emulated NaCl going like this:
+		# cp external_deps/macos-amd64-default_10/{nacl_loader,irt_core-amd64.nexe} build/
+		set(NACL_ARCH "amd64")
+	endif()
 endif()
 
 # Quotes cannot be part of the define as support for them is not reliable.

src.cmake

@@ -92,6 +92,7 @@ set(RENDERERLIST
     ${ENGINE_DIR}/renderer/gl_shader.cpp
     ${ENGINE_DIR}/renderer/gl_shader.h
     ${ENGINE_DIR}/renderer/iqm.h
+    ${ENGINE_DIR}/renderer/ShadeCommon.h
     ${ENGINE_DIR}/renderer/shaders.cpp
     ${ENGINE_DIR}/renderer/tr_animation.cpp
     ${ENGINE_DIR}/renderer/tr_backend.cpp
@@ -147,6 +148,8 @@ set(RENDERERLIST
 
 set(GLSLSOURCELIST
     ${ENGINE_DIR}/renderer/glsl_source/common_cp.glsl
+    ${ENGINE_DIR}/renderer/glsl_source/shaderProfiler_vp.glsl
+    ${ENGINE_DIR}/renderer/glsl_source/shaderProfiler_fp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/clearSurfaces_cp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/cull_cp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/depthReduction_cp.glsl

src/common/Defs.h

@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** No case, No spaces */
 #define PRODUCT_NAME_LOWER  "unvanquished"
 
-#define PRODUCT_VERSION     "0.55"
+#define PRODUCT_VERSION     "0.55.1"
 
 /** Default base package */
 #define DEFAULT_BASE_PAK    PRODUCT_NAME_LOWER

src/common/System.cpp

@@ -36,12 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <fcntl.h>
 #include <signal.h>
 #ifdef __linux__
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-#include <sys/syscall.h>
-#include <linux/random.h>
-#define HAS_GETRANDOM_SYSCALL 1
-#endif
+#include <sys/random.h>
 #endif
 #ifdef __native_client__
 #include <nacl/nacl_exception.h>
@@ -63,7 +58,7 @@ namespace Sys {
 // TODO: also use in VMs when cvars can be observed from multiple modules
 // This option can be turned on when debugging memory management
 #ifdef BUILD_ENGINE
-Cvar::Cvar<bool> pedanticShutdown("common.pedanticShutdown", "run useless shutdown procedures before exit", Cvar::NONE,
+static Cvar::Cvar<bool> pedanticShutdown("common.pedanticShutdown", "run useless shutdown procedures before exit", Cvar::NONE,
 #ifdef USING_SANITIZER
 	true);
 #else
@@ -417,7 +412,7 @@ intptr_t DynamicLib::InternalLoadSym(Str::StringRef sym, std::string& errorStrin
 #endif // __native_client__
 
 #ifdef BUILD_ENGINE
-bool processTerminating = false;
+static bool processTerminating = false;
 
 void OSExit(int exitCode) {
 	processTerminating = true;
@@ -462,19 +457,32 @@ void GenRandomBytes(void* dest, size_t size)
 	size_t bytes_written;
 	if (nacl_secure_random(dest, size, &bytes_written) != 0 || bytes_written != size)
 		Sys::Error("nacl_secure_random failed");
-#elif defined(__linux__) && defined(HAS_GETRANDOM_SYSCALL)
-	if (syscall(SYS_getrandom, dest, size, GRND_NONBLOCK) == -1)
-		Sys::Error("Failed getrandom syscall: %s", strerror(errno));
 #elif defined(__linux__)
-	int fd = open("/dev/urandom", O_RDONLY);
-	if (fd == -1)
-		Sys::Error("Failed to open /dev/urandom: %s", strerror(errno));
-	if (read(fd, dest, size) != (ssize_t) size)
-		Sys::Error("Failed to read from /dev/urandom: %s", strerror(errno));
-	close(fd);
+	ssize_t ret = getrandom(dest, size, GRND_NONBLOCK);
+	if (ret == -1)
+	{
+		if (errno == ENOSYS)
+		{
+			Log::Warn("getrandom syscall is not supported");
+
+			int fd = open("/dev/urandom", O_RDONLY);
+			if (fd == -1)
+				Sys::Error("Failed to open /dev/urandom: %s", strerror(errno));
+			if (read(fd, dest, size) != (ssize_t) size)
+				Sys::Error("Failed to read from /dev/urandom: %s", strerror(errno));
+			close(fd);
+		}
+		else
+		{
+			Sys::Error("getrandom syscall failed: %s", strerror(errno));
+		}
+	}
+	else if (static_cast<size_t>(ret) != size)
+	{
+		Sys::Error("getrandom syscall returned insufficient data");
+	}
 #else
 	arc4random_buf(dest, size);
-
 #endif
 }
 

src/common/cm/cm_load.cpp

@@ -50,9 +50,9 @@ clipMap_t cm;
 int       c_pointcontents;
 int       c_traces, c_brush_traces, c_patch_traces, c_trisoup_traces;
 
-cmodel_t  box_model;
-cplane_t  *box_planes;
-cbrush_t  *box_brush;
+static cmodel_t  box_model;
+static cplane_t  *box_planes;
+static cbrush_t  *box_brush;
 
 void      CM_InitBoxHull();
 void      CM_FloodAreaConnections();
@@ -771,7 +771,7 @@ void CM_LoadMap(Str::StringRef name)
 	std::error_code err;
 	std::string mapData = FS::PakPath::ReadFile(mapFile, err);
 	if (err) {
-		Sys::Drop("Could not load %s", mapFile.c_str());
+		Sys::Drop("Could not load %s: %s (code: %d)", mapFile.c_str(), err.message(), err.value() );
 	}
 
 	std::string externalEntities = FS::PakPath::ReadFile( "maps/" + name + ".ent", err );

src/common/cm/cm_patch.cpp

@@ -36,7 +36,7 @@ Maryland 20850 USA.
 
 #include "cm_patch.h"
 
-int                     c_totalPatchBlocks;
+static int                     c_totalPatchBlocks;
 
 /*
 ================================================================================

src/common/cm/cm_polylib.cpp

@@ -38,10 +38,10 @@ Maryland 20850 USA.
 
 // counters are only bumped when running single threaded,
 // because they are an awefull coherence problem
-int c_active_windings;
-int c_peak_windings;
-int c_winding_allocs;
-int c_winding_points;
+static int c_active_windings;
+static int c_peak_windings;
+static int c_winding_allocs;
+static int c_winding_points;
 
 /*
 =============