Merge branch 'master' into for-0.56.0/sync

Author: VReaperV

cmake/DaemonFlags.cmake

@@ -147,7 +147,7 @@ macro(try_linker_flag PROP FLAG)
     check_C_compiler_flag(${FLAG} FLAG_${PROP})
     set(CMAKE_REQUIRED_FLAGS "")
     if (FLAG_${PROP})
-        set_exe_linker_flag(${FLAG} ${ARGN})
+        set_linker_flag(${FLAG} ${ARGN})
     endif()
 endmacro()
 
@@ -158,7 +158,7 @@ macro(try_exe_linker_flag PROP FLAG)
 	set(CMAKE_REQUIRED_FLAGS "")
 
 	if (FLAG_${PROP})
-		set_linker_flag(${FLAG} ${ARGN})
+		set_exe_linker_flag(${FLAG} ${ARGN})
 	endif()
 endmacro()
 
@@ -395,11 +395,13 @@ else()
 		try_c_cxx_flag(WSTACK_PROTECTOR "-Wstack-protector")
 
 		if (NOT NACL OR (NACL AND GAME_PIE))
-			try_c_cxx_flag(FPIE "-fPIC")
+			try_c_cxx_flag(FPIC "-fPIC")
 
+			# The -pie flag requires -fPIC:
+			# > ld: error: relocation R_X86_64_64 cannot be used against local symbol; recompile with -fPIC
 			# This flag isn't used on macOS:
 			# > clang: warning: argument unused during compilation: '-pie' [-Wunused-command-line-argument]
-			if (NOT APPLE)
+			if (FLAG_FPIC AND NOT APPLE)
 				try_exe_linker_flag(LINKER_PIE "-pie")
 			endif()
 		endif()

src/engine/client/cl_keys.cpp

@@ -511,7 +511,7 @@ static bool DetectBuiltInShortcut( Keyboard::Key key )
 		if ( key == Key::FromCharacter('f') )
 		{
 			Key_ClearStates();
-			Cmd::BufferCommandText("toggle r_fullscreen; vid_restart");
+			r_fullscreen.Set( !r_fullscreen.Get() );
 			return true;
 		}
 		else if ( key == Key::FromCharacter('q') )

src/engine/renderer/glsl_source/fogQuake3_vp.glsl

@@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 uniform float		u_Time;
 
-uniform vec4 u_ColorModulate;
 uniform uint u_ColorGlobal;
 uniform mat4		u_ModelMatrix;
 uniform mat4		u_ModelViewProjectionMatrix;
@@ -58,7 +57,7 @@ void	main()
 
 	VertexFetch( position, LB, color, texCoord, lmCoord );
 
-	color = /* color * u_ColorModulate + */ unpackUnorm4x8( u_ColorGlobal );
+	color = unpackUnorm4x8( u_ColorGlobal );
 
 	DeformVertex( position,
 		      LB.normal,

src/engine/sys/sdl_glimp.cpp

@@ -175,6 +175,10 @@ static Cvar::Cvar<bool> workaround_glExtension_missingArbFbo_useExtFbo(
 	"workaround.glExtension.missingArbFbo.useExtFbo",
 	"Use EXT_framebuffer_object and EXT_framebuffer_blit when ARB_framebuffer_object is not available",
 	Cvar::NONE, true );
+static Cvar::Cvar<bool> workaround_glExtension_glsl120_disableShaderDrawParameters(
+	"workaround.glExtension.glsl120.disableShaderDrawParameters",
+	"Disable ARB_shader_draw_parameters on GLSL 1.20",
+	Cvar::NONE, true );
 static Cvar::Cvar<bool> workaround_glHardware_intel_useFirstProvokinVertex(
 	"workaround.glHardware.intel.useFirstProvokinVertex",
 	"Use first provoking vertex on Intel hardware supporting ARB_provoking_vertex",
@@ -2523,7 +2527,19 @@ static void GLimp_InitExtensions()
 	}
 
 	// made required in OpenGL 4.6
-	glConfig2.shaderDrawParametersAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_draw_parameters, r_arb_shader_draw_parameters.Get() );
+
+	bool ShaderDrawParametersEnabled = r_arb_shader_draw_parameters.Get();
+
+	if ( ShaderDrawParametersEnabled
+		&& GL_ARB_shader_draw_parameters
+		&& glConfig2.shadingLanguageVersion <= 120
+		&& workaround_glExtension_glsl120_disableShaderDrawParameters.Get() )
+	{
+		logger.Warn( "Found ARB_shader_draw_parameters with incompatible GLSL 1.20, disabling ARB_shader_draw_parameters." );
+		ShaderDrawParametersEnabled = false;
+	}
+
+	glConfig2.shaderDrawParametersAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_draw_parameters, ShaderDrawParametersEnabled );
 
 	// made required in OpenGL 4.3
 	glConfig2.SSBOAvailable = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, ARB_shader_storage_buffer_object, r_arb_shader_storage_buffer_object.Get() );
@@ -2668,6 +2684,7 @@ bool GLimp_Init()
 	Cvar::Latch( workaround_glDriver_mesa_v241_disableBindlessTexture );
 	Cvar::Latch( workaround_glDriver_nvidia_v340_disableTextureGather );
 	Cvar::Latch( workaround_glExtension_missingArbFbo_useExtFbo );
+	Cvar::Latch( workaround_glExtension_glsl120_disableShaderDrawParameters );
 	Cvar::Latch( workaround_glHardware_intel_useFirstProvokinVertex );
 
 	/* Enable S3TC on Mesa even if libtxc-dxtn is not available