Merge branch 'master' into for-0.56.0/sync

Author: illwieckz

cmake/DaemonFlags.cmake

@@ -170,23 +170,26 @@ endif()
 
 # Compiler options
 option(USE_FLOAT_EXCEPTIONS "Use floating point exceptions with common.floatException.* cvars" OFF)
-option(USE_FAST_MATH "Use fast math" ON)
+option(USE_FAST_MATH "Use fast math" OFF)
 
 if (USE_FLOAT_EXCEPTIONS)
-	add_definitions(-DDAEMON_USE_FLOAT_EXCEPTIONS)
+    add_definitions(-DDAEMON_USE_FLOAT_EXCEPTIONS)
 endif()
 
 if (MSVC)
     set_c_cxx_flag("/MP")
 
-	if (USE_FLOAT_EXCEPTIONS)
-		set_c_cxx_flag("/fp:strict")
-		# Don't switch on C4305 "truncation from 'double' to 'float'" every
-		# time an unsuffixed decimal constant is used
-		set_c_cxx_flag("/wd4305")
-	elseif (USE_FAST_MATH)
-		set_c_cxx_flag("/fp:fast")
-	endif()
+    if (USE_FAST_MATH)
+        set_c_cxx_flag("/fp:fast")
+    else()
+        # Don't switch on C4305 "truncation from 'double' to 'float'" every
+        # time an unsuffixed decimal constant is used
+        set_c_cxx_flag("/wd4305")
+    endif()
+
+    if (USE_FLOAT_EXCEPTIONS)
+        set_c_cxx_flag("/fp:strict")
+    endif()
 
     set_c_cxx_flag("/d2Zi+" RELWITHDEBINFO)
 
@@ -420,9 +423,13 @@ else()
 	# Saigo NaCl compiler doesn't support LTO, the flag is accepted but linking fails
 	# with “unable to pass LLVM bit-code files to linker” error.
 	if (USE_LTO AND NOT NACL)
-		try_c_cxx_flag(LTO "-flto")
+		try_c_cxx_flag(LTO_AUTO "-flto=auto")
+
+		if (NOT FLAG_LTO_AUTO)
+			try_c_cxx_flag(LTO "-flto")
+		endif()
 
-		if (FLAG_LTO)
+		if (FLAG_LTO_AUTO OR FLAG_LTO)
 			# Pass all compile flags to the linker.
 			set_linker_flag("${CMAKE_CXX_FLAGS}")
 

src.cmake

@@ -147,6 +147,7 @@ set(GLSLSOURCELIST
     ${ENGINE_DIR}/renderer/glsl_source/cull_cp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/depthReduction_cp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/processSurfaces_cp.glsl
+    ${ENGINE_DIR}/renderer/glsl_source/material_cp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/material_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/material_fp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/skybox_vp.glsl
@@ -169,8 +170,6 @@ set(GLSLSOURCELIST
     ${ENGINE_DIR}/renderer/glsl_source/depthtile1_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/depthtile2_fp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/depthtile2_vp.glsl
-    ${ENGINE_DIR}/renderer/glsl_source/dispersion_C_fp.glsl
-    ${ENGINE_DIR}/renderer/glsl_source/dispersion_C_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/fogGlobal_fp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/fogGlobal_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/fogQuake3_fp.glsl
@@ -196,8 +195,6 @@ set(GLSLSOURCELIST
     ${ENGINE_DIR}/renderer/glsl_source/portal_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/reflection_CB_fp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/reflection_CB_vp.glsl
-    ${ENGINE_DIR}/renderer/glsl_source/refraction_C_fp.glsl
-    ${ENGINE_DIR}/renderer/glsl_source/refraction_C_vp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/reliefMapping_fp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/screen_fp.glsl
     ${ENGINE_DIR}/renderer/glsl_source/screen_vp.glsl

src/engine/renderer/Material.cpp

@@ -1604,9 +1604,11 @@ void MaterialSystem::UpdateDynamicSurfaces() {
 
 void MaterialSystem::UpdateFrameData() {
 	atomicCommandCountersBuffer.BindBufferBase( GL_SHADER_STORAGE_BUFFER, Util::ordinal( BufferBind::COMMAND_COUNTERS_STORAGE ) );
+
 	gl_clearSurfacesShader->BindProgram( 0 );
 	gl_clearSurfacesShader->SetUniform_Frame( nextFrame );
 	gl_clearSurfacesShader->DispatchCompute( MAX_VIEWS, 1, 1 );
+
 	atomicCommandCountersBuffer.UnBindBufferBase( GL_SHADER_STORAGE_BUFFER, Util::ordinal( BufferBind::COMMAND_COUNTERS_STORAGE ) );
 
 	GL_CheckErrors();
@@ -1774,11 +1776,8 @@ void MaterialSystem::StartFrame() {
 	if ( !generatedWorldCommandBuffer ) {
 		return;
 	}
+	
 	frames[nextFrame].viewCount = 0;
-
-	// renderedMaterials.clear();
-	// UpdateDynamicSurfaces();
-	// UpdateFrameData();
 }
 
 void MaterialSystem::EndFrame() {
@@ -2059,7 +2058,6 @@ void MaterialSystem::RenderMaterials( const shaderSort_t fromSort, const shaderS
 		renderedMaterials.clear();
 		UpdateDynamicSurfaces();
 		UpdateFrameData();
-		// StartFrame();
 
 		// Make sure compute dispatches from the last frame finished writing to memory
 		glMemoryBarrier( GL_COMMAND_BARRIER_BIT );

src/engine/renderer/glsl_source/common_cp.glsl

@@ -54,41 +54,9 @@ array must be in the form of uvec4 array[] */
                              + gl_GlobalInvocationID.y * gl_NumWorkGroups.x * gl_WorkGroupSize.x\
                              + gl_GlobalInvocationID.x )
 
-/* Common structs */
+/* Macro combinations for subgroup ops */
 
-struct BoundingSphere {
-	vec3 origin;
-	float radius;
-};
-
-struct SurfaceDescriptor {
-	BoundingSphere boundingSphere;
-	uint surfaceCommandIDs[MAX_SURFACE_COMMANDS];
-};
-
-struct PortalSurface {
-	BoundingSphere boundingSphere;
-
-	uint drawSurfID;
-	float distance;
-	vec2 padding;
-};
-
-struct GLIndirectCommand {
-	uint count;
-	uint instanceCount;
-	uint firstIndex;
-	int baseVertex;
-	uint baseInstance;
-};
-
-struct IndirectCompactCommand {
-	uint count;
-	uint firstIndex;
-	uint baseInstance;
-};
-
-struct SurfaceCommand {
-	bool enabled;
-	IndirectCompactCommand drawCommand;
-};
+#if defined(HAVE_KHR_shader_subgroup_basic) && defined(HAVE_KHR_shader_subgroup_arithmetic)\
+	&& defined(HAVE_KHR_shader_subgroup_ballot) && defined(HAVE_ARB_shader_atomic_counter_ops)
+	#define SUBGROUP_STREAM_COMPACTION
+#endif

src/engine/renderer/glsl_source/cull_cp.glsl

@@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* cull_cp.glsl */
 
 #insert common_cp
+#insert material_cp
 
 // Keep this to 64 because we don't want extra shared mem etc. to be allocated, and to minimize wasted lanes
 layout (local_size_x = 64, local_size_y = 1, local_size_z = 1) in;

src/engine/renderer/glsl_source/dispersion_C_fp.glsl

@@ -0,0 +1,72 @@
+/*
+===========================================================================
+
+Daemon BSD Source Code
+Copyright (c) 2025 Daemon Developers
+All rights reserved.
+
+This file is part of the Daemon BSD Source Code (Daemon Source Code).
+
+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.
+
+===========================================================================
+*/
+
+/* material_cp.glsl */
+
+struct BoundingSphere {
+	vec3 origin;
+	float radius;
+};
+
+struct SurfaceDescriptor {
+	BoundingSphere boundingSphere;
+	uint surfaceCommandIDs[MAX_SURFACE_COMMANDS];
+};
+
+struct PortalSurface {
+	BoundingSphere boundingSphere;
+
+	uint drawSurfID;
+	float distance;
+	vec2 padding;
+};
+
+struct GLIndirectCommand {
+	uint count;
+	uint instanceCount;
+	uint firstIndex;
+	int baseVertex;
+	uint baseInstance;
+};
+
+struct IndirectCompactCommand {
+	uint count;
+	uint firstIndex;
+	uint baseInstance;
+};
+
+struct SurfaceCommand {
+	bool enabled;
+	IndirectCompactCommand drawCommand;
+};