Merge branch 'master' into for-0.56.0/sync

Author: illwieckz

CMakeLists.txt

@@ -827,7 +827,8 @@ macro(AddApplicationInternal Target Executable)
         add_dependencies(${Target} runtime_deps)
     endif()
 
-    set_property(TARGET ${Target} APPEND PROPERTY COMPILE_OPTIONS ${A_Flags})
+    set_property(TARGET ${Target} APPEND PROPERTY COMPILE_OPTIONS ${A_CompileFlags})
+    set_property(TARGET ${Target} APPEND PROPERTY LINK_OPTIONS ${A_LinkFlags})
     set_property(TARGET ${Target} APPEND PROPERTY INCLUDE_DIRECTORIES ${ENGINE_DIR} ${MOUNT_DIR} ${LIB_DIR})
     set_property(TARGET ${Target} APPEND PROPERTY COMPILE_DEFINITIONS ${A_Definitions})
     set_target_properties(${Target} PROPERTIES OUTPUT_NAME "${Executable}" PREFIX "" FOLDER "engine")
@@ -846,13 +847,14 @@ endmacro()
 
 function(AddApplication)
     set(oneValueArgs Target ExecutableName)
-    set(multiValueArgs ApplicationMain Definitions Flags CompileFeatures Files Libs Tests)
+    set(multiValueArgs ApplicationMain Definitions CompileFlags LinkFlags Files Libs Tests)
     cmake_parse_arguments(A "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     # Reuse object files between the real application and the test one
     add_library(${A_Target}-objects OBJECT EXCLUDE_FROM_ALL ${A_Files} ${PCH_FILE})
     target_link_libraries(${A_Target}-objects engine-lib ${A_Libs} ${LIBS_BASE} ${CPP23SupportLibrary})
-    set_property(TARGET ${A_Target}-objects APPEND PROPERTY COMPILE_OPTIONS ${A_Flags})
+    set_property(TARGET ${A_Target}-objects APPEND PROPERTY COMPILE_OPTIONS ${A_CompileFlags})
+    set_property(TARGET ${A_Target}-objects APPEND PROPERTY LINK_OPTIONS ${A_LinkFlags})
     set_property(TARGET ${A_Target}-objects APPEND PROPERTY INCLUDE_DIRECTORIES ${ENGINE_DIR} ${MOUNT_DIR} ${LIB_DIR})
     set_property(TARGET ${A_Target}-objects APPEND PROPERTY COMPILE_DEFINITIONS ${A_Definitions})
 
@@ -893,8 +895,8 @@ if (NOT NACL)
             ExecutableName dummyapp
             Definitions USELESS_DEFINITION_TO_AVOID_PCH_ISSUE
             ApplicationMain ${ENGINE_DIR}/null/NullApplication.cpp
-            Flags ${WARNINGS}
-            Files ${COMMON_DIR}/Util.h  # must be nonempty
+            CompileFlags ${WARNINGS}
+            Files ${DUMMYAPPLIST}
             Tests ${ENGINETESTLIST}
         )
     endif()
@@ -920,7 +922,8 @@ if (BUILD_CLIENT)
         ExecutableName ${CLIENT_EXECUTABLE_NAME}
         ApplicationMain ${ENGINE_DIR}/client/ClientApplication.cpp
         Definitions ${Definitions}
-        Flags ${WARNINGS}
+        CompileFlags ${WARNINGS};${OPENMP_COMPILE_FLAG}
+        LinkFlags ${OPENMP_LINK_FLAG}
         Files ${WIN_RC} ${BUILDINFOLIST} ${QCOMMONLIST} ${SERVERLIST} ${CLIENTBASELIST} ${CLIENTLIST}
         Libs ${LIBS_CLIENT} ${LIBS_CLIENTBASE} ${LIBS_ENGINE}
         Tests ${CLIENTTESTLIST}
@@ -938,7 +941,7 @@ if (BUILD_SERVER)
         ExecutableName daemonded
         ApplicationMain ${ENGINE_DIR}/server/ServerApplication.cpp
         Definitions BUILD_ENGINE BUILD_SERVER
-        Flags ${WARNINGS}
+        CompileFlags ${WARNINGS}
         Files ${WIN_RC} ${BUILDINFOLIST} ${QCOMMONLIST} ${SERVERLIST} ${DEDSERVERLIST}
         Libs ${LIBS_ENGINE}
         Tests ${ENGINETESTLIST}
@@ -951,7 +954,7 @@ if (BUILD_TTY_CLIENT)
         ExecutableName daemon-tty
         ApplicationMain ${ENGINE_DIR}/client/ClientApplication.cpp
         Definitions BUILD_ENGINE BUILD_TTY_CLIENT
-        Flags ${WARNINGS}
+        CompileFlags ${WARNINGS}
         Files ${WIN_RC} ${BUILDINFOLIST} ${QCOMMONLIST} ${SERVERLIST} ${CLIENTBASELIST} ${TTYCLIENTLIST}
         Libs ${LIBS_CLIENTBASE} ${LIBS_ENGINE}
         Tests ${ENGINETESTLIST}

cmake/DaemonFlags.cmake

@@ -259,6 +259,10 @@ if (USE_FLOAT_EXCEPTIONS)
     add_definitions(-DDAEMON_USE_FLOAT_EXCEPTIONS)
 endif()
 
+if (NOT NACL AND BUILD_CLIENT)
+	option(USE_OPENMP "Use OpenMP to parallelize some tasks" OFF)
+endif()
+
 if (MSVC)
     set_c_cxx_flag("/MP")
 
@@ -267,6 +271,11 @@ if (MSVC)
         set_cxx_flag("/std:c++23preview")
     endif()
 
+	if (NOT NACL AND BUILD_CLIENT AND USE_OPENMP)
+		# Flag checks doen't work with MSVC so we assume it's there.
+		set(OPENMP_COMPILE_FLAG "/openmp")
+	endif()
+
     if (USE_FAST_MATH)
         set_c_cxx_flag("/fp:fast")
     else()
@@ -362,6 +371,17 @@ else()
 		endif()
 	endif()
 
+	if (NOT NACL AND BUILD_CLIENT AND USE_OPENMP)
+		check_CXX_compiler_flag("-fopenmp" FLAG_FOPENMP)
+
+		if (FLAG_FOPENMP)
+			set(OPENMP_COMPILE_FLAG "-fopenmp")
+			set(OPENMP_LINK_FLAG "-fopenmp")
+		else()
+			message(WARNING "Missing OpenMP")
+		endif()
+	endif()
+
 	if (NACL AND USE_NACL_SAIGO AND SAIGO_ARCH STREQUAL "arm")
 		# Saigo produces broken arm builds when optimizing them.
 		# See: https://github.com/Unvanquished/Unvanquished/issues/3297

src.cmake

@@ -188,6 +188,8 @@ set(ENGINELIST
     ${ENGINE_DIR}/framework/CvarSystem.h
     ${ENGINE_DIR}/framework/LogSystem.cpp
     ${ENGINE_DIR}/framework/LogSystem.h
+    ${ENGINE_DIR}/framework/OmpSystem.cpp
+    ${ENGINE_DIR}/framework/OmpSystem.h
     ${ENGINE_DIR}/framework/Resource.cpp
     ${ENGINE_DIR}/framework/Resource.h
     ${ENGINE_DIR}/framework/System.cpp
@@ -207,6 +209,11 @@ set(ENGINELIST
     ${ENGINE_DIR}/RefAPI.h
 )
 
+set(OMPLIST
+    ${ENGINE_DIR}/framework/OmpSystem.cpp
+    ${ENGINE_DIR}/framework/OmpSystem.h
+)
+
 if (WIN32)
     set(ENGINELIST ${ENGINELIST}
         ${ENGINE_DIR}/sys/con_passive.cpp
@@ -271,6 +278,7 @@ set(CLIENTBASELIST
 )
 
 set(CLIENTLIST
+    ${OMPLIST}
     ${ENGINE_DIR}/audio/ALObjects.cpp
     ${ENGINE_DIR}/audio/ALObjects.h
     ${ENGINE_DIR}/audio/Audio.cpp
@@ -304,16 +312,23 @@ set(CLIENTTESTLIST ${ENGINETESTLIST}
 )
 
 set(TTYCLIENTLIST
+    ${OMPLIST}
     ${ENGINE_DIR}/null/NullAudio.cpp
     ${ENGINE_DIR}/null/NullKeyboard.cpp
     ${ENGINE_DIR}/null/null_input.cpp
     ${ENGINE_DIR}/null/null_renderer.cpp
 )
 
 set(DEDSERVERLIST
+    ${OMPLIST}
     ${ENGINE_DIR}/null/NullKeyboard.cpp
     ${ENGINE_DIR}/null/null_client.cpp
     ${ENGINE_DIR}/null/null_input.cpp
 )
 
+set(DUMMYAPPLIST
+    ${OMPLIST}
+    ${COMMON_DIR}/Util.h
+)
+
 set(WIN_RC ${ENGINE_DIR}/sys/windows-resource/icon.rc)

src/engine/client/cl_main.cpp

@@ -2136,7 +2136,7 @@ bool CL_InitRenderer()
 		}
 	}
 
-	cls.whiteShader = re.RegisterShader( "white", RSF_NOMIP );
+	cls.whiteShader = re.RegisterShader( "white", RSF_NOMIP | RSF_2D );
 
 	g_console_field_width = cls.windowConfig.vidWidth / SMALLCHAR_WIDTH - 2;
 	g_consoleField.SetWidth(g_console_field_width);

src/engine/client/client.h

@@ -306,7 +306,7 @@ struct clientStatic_t
 
 	// rendering info
 	WindowConfig windowConfig;
-	qhandle_t   whiteShader;
+	qhandle_t   whiteShader; // used for console drawing
 	fontInfo_t *consoleFont;
 
 	// www downloading

src/engine/framework/OmpSystem.cpp

@@ -0,0 +1,108 @@
+/*
+===========================================================================
+Daemon BSD Source Code
+Copyright (c) 2025, Daemon Developers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Daemon developers nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL DAEMON DEVELOPERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===========================================================================
+*/
+
+#include <algorithm>
+
+#include "CvarSystem.h"
+#include "OmpSystem.h"
+
+#if defined(_OPENMP)
+#include "omp.h"
+#endif
+
+#if defined(_OPENMP)
+static Cvar::Range<Cvar::Cvar<int>> common_ompThreads(
+	"common.ompThreads", "OpenMP threads", Cvar::NONE, 0, 0, 32 );
+#endif
+
+namespace Omp {
+#if defined(_OPENMP)
+static int ompMaxThreads = 1;
+#endif
+
+static int ompThreads = 1;
+
+static void ReadMaxThreads()
+{
+#if defined(_OPENMP)
+	ompMaxThreads = omp_get_max_threads();
+#endif
+}
+
+void EnlistThreads()
+{
+#if defined(_OPENMP)
+	omp_set_num_threads( ompThreads );
+#endif
+}
+
+void SetupThreads()
+{
+#if defined(_OPENMP)
+	if ( common_ompThreads.Get() )
+	{
+		ompThreads = common_ompThreads.Get();
+	}
+	else
+	{
+		switch( ompMaxThreads )
+		{
+			case 1:
+				ompThreads = 1;
+				break;
+			case 2:
+			case 3:
+				ompThreads = 2;
+				break;
+			default:
+				/* Using half threads than available is known to work best with:
+				- 2 threads on Low-end 4-cores (no SMP) Ryzen 3 3200G,
+				- 16 threads on High-end 16-cores/32-threads Ryzen Threadripper PRO 3955WX
+
+				It has not been tested on a system where ompMaxThreads / 2 > 16. */
+				ompThreads = std::min( ompMaxThreads / 2, 16 );
+		}
+	}
+#endif
+
+	EnlistThreads();
+}
+
+void Init()
+{
+	ReadMaxThreads();
+	SetupThreads();
+}
+
+int GetThreads()
+{
+	return ompThreads;
+}
+}

src/engine/framework/OmpSystem.h

@@ -0,0 +1,41 @@
+/*
+===========================================================================
+Daemon BSD Source Code
+Copyright (c) 2025, Daemon Developers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Daemon developers nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL DAEMON DEVELOPERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===========================================================================
+*/
+
+#ifndef COMMON_OMP_SYSTEM_H_
+#define COMMON_OMP_SYSTEM_H_
+
+namespace Omp {
+void EnlistThreads();
+void SetupThreads();
+void Init();
+int GetThreads();
+};
+
+#endif // COMMON_OMP_SYSTEM_H_

src/engine/framework/System.cpp

@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ConsoleHistory.h"
 #include "CommandSystem.h"
 #include "LogSystem.h"
+#include "OmpSystem.h"
 #include "System.h"
 #include "CrashDump.h"
 #include "CvarSystem.h"
@@ -968,6 +969,8 @@ static void Init(int argc, char** argv)
 	for (auto& cvar: cmdlineArgs.cvars)
 		Cvar::SetValue(cvar.first, cvar.second);
 
+	Omp::Init();
+
 	// Load the console history
 	Console::History::Load();
 

src/engine/qcommon/common.cpp

@@ -47,6 +47,7 @@ Maryland 20850 USA.
 #include "framework/CommandSystem.h"
 #include "framework/CvarSystem.h"
 #include "framework/LogSystem.h"
+#include "framework/OmpSystem.h"
 #include "framework/System.h"
 #include "sys/sys_events.h"
 #include <common/FileSystem.h>
@@ -783,6 +784,8 @@ static Cvar::Cvar<bool> showTraceStats("common.showTraceStats", "are physics tra
 
 void Com_Frame()
 {
+	Omp::SetupThreads();
+
 	int             msec, minMsec;
 	static int      lastTime = 0;
 	//int             key;

src/engine/renderer/DetectGLVendors.cpp

@@ -46,6 +46,7 @@ std::string GetGLHardwareVendorName( glHardwareVendor_t hardwareVendor )
 		"Broadcom",
 		"Intel",
 		"Nvidia",
+		"Moore Threads",
 		"OutOfRange",
 	};
 
@@ -71,6 +72,7 @@ std::string GetGLDriverVendorName( glDriverVendor_t driverVendor )
 		"Intel",
 		"Mesa",
 		"Nvidia",
+		"Moore Threads",
 		"OutOfRange",
 	};
 
@@ -117,10 +119,12 @@ void DetectGLVendors(
 		// Mesa Panfrost, newer Panfrost uses "Mesa" instead.
 		{ "Panfrost", { glDriverVendor_t::MESA, glHardwareVendor_t::ARM } },
 		// Mesa Nvidia for supported OpenGL 2+ hardware.
+		// Mesa Amber also provides "Nouveau", but this is for unsupported pre-OpenGL 2 Nvidia.
 		{ "nouveau", { glDriverVendor_t::MESA, glHardwareVendor_t::NVIDIA } },
 		// Proprietary Nvidia drivers on all systems like Linux, Windows, and macOS.
 		{ "NVIDIA Corporation", { glDriverVendor_t::NVIDIA, glHardwareVendor_t::NVIDIA } },
-		// Mesa Amber also provides "Nouveau", but this is for unsupported pre-OpenGL 2 Nvidia.
+		// Moore Threads drivers on Linux and Windows.
+		{ "Moore Threads", { glDriverVendor_t::MTHREADS, glHardwareVendor_t::MTHREADS } },
 	};
 
 	auto it = vendorDriverHardware.find( vendorString );