Merge branch 'master' into for-0.56.0/sync

Author: illwieckz

CMakeLists.txt

@@ -514,11 +514,20 @@ endif()
 if (WIN32)
     set(LIBS_BASE ${LIBS_BASE} winmm ws2_32)
 elseif (NACL)
-    if (NOT USE_NACL_SAIGO)
-        find_library(NACL_EXCEPTION nacl_exception)
-        find_library(NACL_MINIDUMP minidump_generator)
-        set(LIBS_BASE ${LIBS_BASE} ${NACL_MINIDUMP} ${NACL_EXCEPTION})
+    find_library(NACL_EXCEPTION nacl_exception)
+    find_library(NACL_MINIDUMP minidump_generator)
+
+    # HACK: To be removed when Saigo is repackaged properly.
+    if (NOT NACL_MINIDUMP
+    # NACL_TARGET is specific to Saigo, PNaCl target is le32 and doesn't set NACL_TARGET.
+    AND "${NACL_TARGET}" STREQUAL "i686"
+    # x86_64-nacl/lib32 is specific to Google build, other builds may provide i686-nacl/lib instead.
+    AND EXISTS "${DEPS_DIR}/saigo_newlib/x86_64-nacl/lib32")
+        set(NACL_EXCEPTION "${DEPS_DIR}/saigo_newlib/x86_64-nacl/lib32/libnacl_exception.a")
+        set(NACL_MINIDUMP "${DEPS_DIR}/saigo_newlib/x86_64-nacl/lib32/libminidump_generator.a")
     endif()
+
+    set(LIBS_BASE ${LIBS_BASE} ${NACL_MINIDUMP} ${NACL_EXCEPTION})
 else()
     find_library(LIBM m)
     if (LIBM)

src/common/System.cpp

@@ -39,10 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/random.h>
 #endif
 #ifdef __native_client__
-#if !defined(__saigo__)
-#include <nacl/nacl_exception.h>
-#include <nacl/nacl_minidump.h>
-#endif
+#include <nacl/native_client/src/include/nacl/nacl_minidump.h>
 #include <nacl/nacl_random.h>
 #else
 #include <dlfcn.h>
@@ -60,12 +57,12 @@ 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
-static Cvar::Cvar<bool> pedanticShutdown("common.pedanticShutdown", "run useless shutdown procedures before exit", Cvar::NONE,
 #ifdef USING_SANITIZER
-	true);
+constexpr bool defaultPedanticShutdown = true;
 #else
-	false);
+constexpr bool defaultPedanticShutdown = false;
 #endif
+static Cvar::Cvar<bool> pedanticShutdown("common.pedanticShutdown", "run useless shutdown procedures before exit", Cvar::NONE, defaultPedanticShutdown);
 #endif // BUILD_ENGINE
 
 #if defined(BUILD_ENGINE) && defined(_WIN32)
@@ -337,10 +334,8 @@ static void CrashHandler(const void* data, size_t n)
 
 void SetupCrashHandler()
 {
-#if !defined(__saigo__)
     nacl_minidump_register_crash_handler();
     nacl_minidump_set_callback(CrashHandler);
-#endif
 }
 #else
 NORETURN static void CrashHandler(int sig)

src/engine/framework/CvarSystem.cpp

@@ -688,41 +688,48 @@ namespace Cvar {
                 CvarMap& cvars = GetCvarMap();
 
                 bool raw = false;
-                std::string match = "";
+                std::string pattern = "";
 
                 //Read parameters
                 if (args.Argc() > 1) {
-                    match = args.Argv(1);
-                    if (Cmd::IsSwitch(match, "-raw")) {
+                    pattern = args.Argv(1);
+                    if (Cmd::IsSwitch(pattern, "-raw")) {
                         raw = true;
-                        match = (args.Argc() > 2) ? args.Argv(2) : "";
+                        pattern = (args.Argc() > 2) ? args.Argv(2) : "";
                     }
                 }
 
-                std::vector<cvarRecord_t*> matches;
+                struct CvarMatch_t {
+                    std::string name;
+                    cvarRecord_t* record;
+                };
 
-                std::vector<std::string> matchesNames;
-                size_t maxNameLength = 0;
+                std::vector<CvarMatch_t> matches;
 
-                std::vector<std::string> matchesValues;
+                size_t maxNameLength = 0;
 
                 //Find all the matching cvars
                 for (auto& entry : cvars) {
-                    if (Com_Filter(match.c_str(), entry.first.c_str(), false)) {
-                        matchesNames.push_back(entry.first);
+                    if (Com_Filter(pattern.c_str(), entry.first.c_str(), false)) {
+                        CvarMatch_t match;
 
-                        matches.push_back(entry.second);
-                        matchesValues.push_back(entry.second->value);
+                        match.name = entry.first;
+                        match.record = entry.second;
+                        matches.push_back(match);
 
                         //TODO: the raw parameter is not handled, need a function to escape carets
-                        maxNameLength = std::max(maxNameLength, entry.first.length());
+                        maxNameLength = std::max(maxNameLength, match.name.length());
                     }
                 }
 
+                // TODO: case insensitive compare function?
+                std::sort(matches.begin(), matches.end(),
+                    [](CvarMatch_t &a, CvarMatch_t &b) { return a.name < b.name; });
+
                 //Print the matches, keeping the flags and descriptions aligned
                 for (size_t i = 0; i < matches.size(); i++) {
-                    const std::string& name = matchesNames[i];
-                    cvarRecord_t* var = matches[i];
+                    const std::string& name = matches[i].name;
+                    cvarRecord_t* var = matches[i].record;
 
                     std::string cvarFlags = "";
                     cvarFlags += (var->flags & SERVERINFO) ? "S" : "_";

src/engine/renderer/Material.cpp

@@ -908,10 +908,8 @@ void BindShaderLightMapping( Material* material ) {
 
 		const float interpolation = 1.0 - trilerp[0];
 
-		if ( r_logFile->integer ) {
-			GLimp_LogComment( va( "Probe 0 distance = %f, probe 1 distance = %f, interpolation = %f\n",
-				Distance( position, probes[0]->origin ), Distance( position, probes[1]->origin ), interpolation ) );
-		}
+		GLIMP_LOGCOMMENT( "Probe 0 distance = %f, probe 1 distance = %f, interpolation = %f",
+			Distance( position, probes[0]->origin ), Distance( position, probes[1]->origin ), interpolation );
 
 		// bind u_EnvironmentMap0
 		gl_lightMappingShaderMaterial->SetUniform_EnvironmentMap0Bindless(
@@ -2036,7 +2034,7 @@ void MaterialSystem::AddAutospriteSurfaces() {
 	for ( const drawSurf_t &drawSurf : autospriteSurfaces )
 	{
 		R_AddDrawSurf( drawSurf.surface, drawSurf.shader,
-		               drawSurf.lightmapNum(), drawSurf.fogNum(), drawSurf.bspSurface );
+		               drawSurf.lightmapNum(), drawSurf.fog, drawSurf.bspSurface );
 	}
 }
 

src/engine/renderer/ShadeCommon.h

@@ -87,16 +87,6 @@ template<typename Obj> static bool hasExplicitelyDisabledLightMap( Obj* obj )
 	return GetSurfaceShader( obj )->surfaceFlags & SURF_NOLIGHTMAP;
 }
 
-inline size_t GetFogNum( shaderCommands_t* tess )
-{
-	return tess->fogNum;
-}
-
-inline size_t GetFogNum( drawSurf_t* drawSurf )
-{
-	return drawSurf->fogNum();
-}
-
 inline shaderStage_t* GetSurfaceLastStage( shaderCommands_t* tess )
 {
 	return tess->surfaceLastStage;

src/engine/renderer/gl_shader.cpp

@@ -529,8 +529,19 @@ static std::string GenCompatHeader() {
 		str += "float smoothstep(float edge0, float edge1, float x) { float t = clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0); return t * t * (3.0 - 2.0 * t); }\n";
 	}
 
-	if ( !glConfig2.gpuShader5Available ) {
-		str += "#define unpackUnorm4x8( value ) ( ( vec4( value, value >> 8, value >> 16, value >> 24 ) & 0xFF ) / 255.0f )\n";
+	if ( !glConfig2.gpuShader5Available && glConfig2.gpuShader4Available )
+	{
+		str +=
+R"(vec4 unpackUnorm4x8( uint value )
+{
+	uint x = value & 0xFFu;
+	uint y = ( value >> 8u ) & 0xFFu;
+	uint z = ( value >> 16u ) & 0xFFu;
+	uint w = ( value >> 24u ) & 0xFFu;
+
+	return vec4( x, y, z, w ) / 255.0f;
+}
+)";
 	}
 
 	/* Driver bug: Adrenaline/OGLP drivers fail to recognise the ARB function versions when they return a 4.6 context
@@ -2351,13 +2362,14 @@ void GLShader::BindProgram( int deformIndex ) {
 
 	currentProgram = &shaderPrograms[index];
 
-	if ( r_logFile->integer ) {
+	if ( GLimp_isLogging() )
+	{
 		std::string macros;
 
 		GetCompileMacrosString( index, macros, GLCompileMacro::VERTEX | GLCompileMacro::FRAGMENT );
 
-		auto msg = Str::Format( "--- GL_BindProgram( name = '%s', macros = '%s' ) ---\n", this->GetName(), macros );
-		GLimp_LogComment( msg.c_str() );
+		GLIMP_LOGCOMMENT( "--- GL_BindProgram( name = '%s', macros = '%s' ) ---",
+			this->GetName(), macros );
 	}
 
 	GL_BindProgram( &shaderPrograms[index] );