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

Author: VReaperV

CMakeLists.txt

@@ -117,14 +117,16 @@ if(NOT DAEMON_EXTERNAL_APP)
         option(USE_MUMBLE "Build Daemon with mumblelink sumpport" ON)
     endif()
 
-    cmake_dependent_option(USE_SMP "Compile with support for running the renderer in a separate thread" 1 BUILD_CLIENT 0)
+    option(USE_SMP "Compile with support for running the renderer in a separate thread" ON)
     option(USE_BREAKPAD "Generate Daemon crash dumps (which require Breakpad tools to read)" OFF)
 endif()
 
 option(BUILD_TESTS "Build unit test applications" OFF)
 
 option(USE_LTO "Use link-time optimization for release builds" OFF)
-cmake_dependent_option(USE_SLIM_LTO "Generate slim LTO objects, improves build times" 1 "USE_LTO AND \"${CMAKE_CXX_COMPILER_ID}\" STREQUAL GNU" 0)
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL GNU)
+    option(USE_SLIM_LTO "Generate slim LTO objects, improves build times" OFF)
+endif()
 option(USE_HARDENING "Use stack protection and other hardening flags" OFF)
 option(USE_WERROR "Tell the compiler to make the build fail when warnings are present" OFF)
 option(USE_PEDANTIC "Tell the compiler to be pedantic" OFF)

cmake/DaemonGame.cmake

@@ -119,6 +119,9 @@ function(buildGameModule module_slug)
 		set_target_properties(${module_target} PROPERTIES PREFIX "")
 		set(GAMEMODULE_DEFINITIONS "${GAMEMODULE_DEFINITIONS};BUILD_VM_IN_PROCESS")
 	else()
+		if (module_slug STREQUAL "native-exe")
+			set(GAMEMODULE_DEFINITIONS "${GAMEMODULE_DEFINITIONS};BUILD_VM_NATIVE_EXE")
+		endif()
 		add_executable("${module_target}" ${module_target_args})
 	endif()
 

external_deps/build.sh

@@ -876,7 +876,7 @@ build_naclruntime() {
 	"${download_only}" && return
 
 	cd "${dir_name}"
-	scons --mode=opt-linux "platform=${NACL_ARCH}" werror=0 sysinfo=0 sel_ldr
+	env -i /usr/bin/env bash -l -c "python3 /usr/bin/scons --mode=opt-linux 'platform=${NACL_ARCH}' werror=0 sysinfo=0 sel_ldr"
 	cp "scons-out/opt-linux-${NACL_ARCH}/staging/nacl_helper_bootstrap" "${PREFIX}/nacl_helper_bootstrap"
 	cp "scons-out/opt-linux-${NACL_ARCH}/staging/sel_ldr" "${PREFIX}/nacl_loader"
 }

src.cmake

@@ -94,6 +94,8 @@ set(RENDERERLIST
     ${ENGINE_DIR}/renderer/tr_font.cpp
     ${ENGINE_DIR}/renderer/GeometryCache.cpp
     ${ENGINE_DIR}/renderer/GeometryCache.h
+    ${ENGINE_DIR}/renderer/GeometryOptimiser.cpp
+    ${ENGINE_DIR}/renderer/GeometryOptimiser.h
     ${ENGINE_DIR}/renderer/InternalImage.cpp
     ${ENGINE_DIR}/renderer/InternalImage.h
     ${ENGINE_DIR}/renderer/Material.cpp

src/common/System.cpp

@@ -312,22 +312,38 @@ static const char *WindowsExceptionString(DWORD code)
 		return "Unknown exception";
 	}
 }
+
+#ifdef _MSC_VER
+// The standard library implements calling std::terminate with an exception filter
+static LPTOP_LEVEL_EXCEPTION_FILTER originalExceptionFilter;
+#endif
+
  ALIGN_STACK_FOR_MINGW static LONG WINAPI CrashHandler(PEXCEPTION_POINTERS ExceptionInfo)
 {
 	// Reset handler so that any future errors cause a crash
 	SetUnhandledExceptionFilter(nullptr);
 
-	// TODO: backtrace
+#ifdef _MSC_VER
+	constexpr DWORD CPP_EXCEPTION = 0xe06d7363;
+	if (ExceptionInfo->ExceptionRecord->ExceptionCode == CPP_EXCEPTION && originalExceptionFilter) {
+		return originalExceptionFilter(ExceptionInfo);
+	}
+#endif
 
 	Sys::Error("Crashed with exception 0x%lx: %s", ExceptionInfo->ExceptionRecord->ExceptionCode, WindowsExceptionString(ExceptionInfo->ExceptionRecord->ExceptionCode));
 }
 void SetupCrashHandler()
 {
+#ifdef _MSC_VER
+	originalExceptionFilter =
+#endif
 	SetUnhandledExceptionFilter(CrashHandler);
 }
 #elif defined(__native_client__)
 static void CrashHandler(const void* data, size_t n)
 {
+    // Note: this only works on the main thread. Otherwise we hit
+    // Sys::Error("SendMsg from non-main VM thread");
     VM::CrashDump(static_cast<const uint8_t*>(data), n);
     Sys::Error("Crashed with NaCl exception");
 }

src/engine/qcommon/net_ip.cpp

@@ -64,6 +64,10 @@ using sa_family_t = unsigned short;
 
 #       define socketError   WSAGetLastError()
 
+#       if !defined(WSA_FLAG_NO_HANDLE_INHERIT)
+                #define WSA_FLAG_NO_HANDLE_INHERIT 0x80
+#       endif
+
 namespace net {
 	namespace errc {
 		constexpr auto resource_unavailable_try_again = WSAEWOULDBLOCK;

src/engine/qcommon/q_shared.cpp

@@ -288,45 +288,6 @@ int Com_HashKey( char *string, int maxlen )
 /*
 ============================================================================
 
-q_shared.h-enum to name conversion
-
-============================================================================
-*/
-
-const char *Com_EntityTypeName(entityType_t entityType)
-{
-	switch (entityType)
-	{
-	case entityType_t::ET_GENERAL:          return "GENERAL";
-	case entityType_t::ET_PLAYER:           return "PLAYER";
-	case entityType_t::ET_ITEM:             return "ITEM";
-	case entityType_t::ET_BUILDABLE:        return "BUILDABLE";
-	case entityType_t::ET_LOCATION:         return "LOCATION";
-	case entityType_t::ET_MISSILE:          return "MISSILE";
-	case entityType_t::ET_MOVER:            return "MOVER";
-	case entityType_t::ET_PORTAL:           return "PORTAL";
-	case entityType_t::ET_SPEAKER:          return "SPEAKER";
-	case entityType_t::ET_PUSHER:           return "PUSHER";
-	case entityType_t::ET_TELEPORTER:       return "TELEPORTER";
-	case entityType_t::ET_INVISIBLE:        return "INVISIBLE";
-	case entityType_t::ET_FIRE:             return "FIRE";
-	case entityType_t::ET_CORPSE:           return "CORPSE";
-	case entityType_t::ET_PARTICLE_SYSTEM:  return "PARTICLE_SYSTEM";
-	case entityType_t::ET_ANIMMAPOBJ:       return "ANIMMAPOBJ";
-	case entityType_t::ET_MODELDOOR:        return "MODELDOOR";
-	case entityType_t::ET_LIGHTFLARE:       return "LIGHTFLARE";
-	case entityType_t::ET_LEV2_ZAP_CHAIN:   return "LEV2_ZAP_CHAIN";
-	case entityType_t::ET_BEACON:   	return "BEACON";
-	default:
-		if(entityType >= entityType_t::ET_EVENTS)
-			return "EVENT";
-		return nullptr;
-	}
-}
-
-/*
-============================================================================
-
 PARSING
 
 ============================================================================

src/engine/qcommon/q_shared.h

@@ -2085,56 +2085,10 @@ union OpaquePlayerState {
 //----(SA)  removed
 	};
 
-// entityState_t is the information conveyed from the server
-// in an update message about entities that the client will
-// need to render in some way
-// Different eTypes may use the information in different ways
-// The messages are delta compressed, so it doesn't really matter if
-// the structure size is fairly large
-//
-// NOTE: all fields in here must be 32 bits (or those within sub-structures)
-//
-// You can use Com_EntityTypeName to get a String representation of this enum
-	enum class entityType_t
-	{
-		ET_GENERAL,
-		ET_PLAYER,
-		ET_ITEM,
-
-		ET_BUILDABLE,       // buildable type
-
-		ET_LOCATION,
-
-		ET_MISSILE,
-		ET_MOVER,
-		ET_UNUSED,
-		ET_PORTAL,
-		ET_SPEAKER,
-		ET_PUSHER,
-		ET_TELEPORTER,
-		ET_INVISIBLE,
-		ET_FIRE,
-
-		ET_CORPSE,
-		ET_PARTICLE_SYSTEM,
-		ET_ANIMMAPOBJ,
-		ET_MODELDOOR,
-		ET_LIGHTFLARE,
-		ET_LEV2_ZAP_CHAIN,
-
-		ET_BEACON,
-
-		ET_EVENTS       // any of the EV_* events can be added freestanding
-		// by setting eType to ET_EVENTS + eventNum
-		// this avoids having to set eFlags and eventNum
-	};
-
-	const char *Com_EntityTypeName(entityType_t entityType);
-
 	struct entityState_t
 	{
 		int          number; // entity index
-		entityType_t eType; // entityType_t
+		int eType; // entityType_t
 		int          eFlags;
 
 		trajectory_t pos; // for calculating position