Merge remote-tracking branch 'origin/master' into gles-shaders

Author: Shivansps

ci/post/requirements.txt

@@ -1,3 +1,3 @@
-Mako==1.3.11
+Mako==1.3.12
 requests==2.32.4
 semantic-version==2.8.5

code/cfile/cfilesystem.cpp

@@ -2437,7 +2437,9 @@ int cf_create_default_path_string(SCP_string& path, int pathtype, const char* fi
 		}
 
 		if (!root) {
-			Assert( filename != NULL );
+			if (filename == nullptr) {
+				return 0;
+			}
 			path.assign(filename);
 			return 1;
 		}

code/def_files/data/effects/fog-f.sdr

@@ -20,6 +20,9 @@ layout (std140) uniform genericData {
 	float fog_density;
 	float zNear;
 	float zFar;
+
+	float clip_inf_dist;
+	float clip_dist;
 };
 
 void main()
@@ -33,6 +36,9 @@ void main()
 	// Now we compute the depth value in projection space using the clipping plane information
 	float view_depth = 2.0 * zNear * zFar / (zFar + zNear - depth_normalized * (zFar - zNear));
 
+	float skybox_compat_fake = step(1.0, depth_val);
+	view_depth = clamp(view_depth, 0.0, mix(clip_dist, clip_inf_dist, skybox_compat_fake));
+
 	if (isinf(view_depth)) {
 		fragOut0.rgb = color_in.rgb;
 	} else {

code/def_files/data/effects/main-f.sdr

@@ -47,8 +47,8 @@ layout (std140) uniform modelData {
 	model_light lights[MAX_LIGHTS];
 
 	float outlineWidth;
-	float fogStart;
-	float fogScale;
+	float fogNear;
+	float fogDensity;
 	int buffer_matrix_offset;
 
 	vec4 clip_equation;
@@ -392,9 +392,10 @@ void main()
 		#prereplace ENDIF_FLAG //MODEL_SDR_FLAG_DIFFUSE
 		// This code will only be used by the forward renderer so we apply the fog effect to both the emissive and the base
 		// color.
-		baseColor.rgb = mix(emissiveColor.rgb + baseColor.rgb, finalFogColor, vertIn.fogDist);
+		float fogDensityFinal = clamp(1 - pow(fogDensity, vertIn.fogDist) , 0.0, 1.0);
+		baseColor.rgb = mix(emissiveColor.rgb + baseColor.rgb, finalFogColor, fogDensityFinal);
 		emissiveColor.rgb = vec3(0.0); // Zero the emissive color since it has already been added by the previous line
-		specColor.rgb *= vertIn.fogDist;
+		specColor.rgb *= fogDensityFinal;
 	#prereplace ENDIF_FLAG //MODEL_SDR_FLAG_FOG
 
 	#prereplace IF_FLAG MODEL_SDR_FLAG_DIFFUSE

code/def_files/data/effects/main-g.sdr

@@ -54,8 +54,8 @@ layout (std140) uniform modelData {
 	model_light lights[MAX_LIGHTS];
 
 	float outlineWidth;
-	float fogStart;
-	float fogScale;
+	float fogNear;
+	float fogDensity;
 	int buffer_matrix_offset;
 
 	vec4 clip_equation;

code/def_files/data/effects/main-v.sdr

@@ -50,8 +50,8 @@ layout (std140) uniform modelData {
 	model_light lights[MAX_LIGHTS];
 
 	float outlineWidth;
-	float fogStart;
-	float fogScale;
+	float fogNear;
+	float fogDensity;
 	int buffer_matrix_offset;
 
 	vec4 clip_equation;
@@ -203,7 +203,7 @@ void main()
 	vertOut.tangentMatrix = mat3(t, b, normal);
 
 	#prereplace IF_FLAG MODEL_SDR_FLAG_FOG
-		vertOut.fogDist = clamp((gl_Position.z - fogStart) * 0.75 * fogScale, 0.0, 1.0);
+		vertOut.fogDist = gl_Position.z - fogNear;
 	#prereplace ENDIF_FLAG //MODEL_SDR_FLAG_FOG
 
 	#prereplace IF_FLAG MODEL_SDR_FLAG_TRANSFORM

code/gamesnd/gamesnd.cpp

@@ -601,6 +601,7 @@ void gamesnd_unload_gameplay_sounds()
 			}
 		}
 	}
+	snd_unload_cleanup();
 }
 
 /**
@@ -636,6 +637,7 @@ void gamesnd_unload_interface_sounds()
 			}
 		}
 	}
+	snd_unload_cleanup();
 }
 
 void parse_gamesnd_old(game_snd* gs)

code/graphics/material.cpp

@@ -674,14 +674,12 @@ bool model_material::is_batched() const
 	return Batched;
 }
 
-void model_material::set_fog(int r, int g, int b, float _near, float _far)
+void model_material::set_fog(int r, int g, int b)
 {
 	Fog_params.enabled = true;
 	Fog_params.r = r;
 	Fog_params.g = g;
 	Fog_params.b = b;
-	Fog_params.dist_near = _near;
-	Fog_params.dist_far = _far;
 }
 
 void model_material::set_fog()

code/graphics/material.h

@@ -172,8 +172,6 @@ class model_material : public material
 		int r = 0;
 		int g = 0;
 		int b = 0;
-		float dist_near = -1.0f;
-		float dist_far = -1.0f;
 	};
 
  private:
@@ -255,7 +253,7 @@ class model_material : public material
     int get_shader_runtime_early_flags() const;
 	int get_shader_runtime_flags() const;
 
-	void set_fog(int r, int g, int b, float near, float far);
+	void set_fog(int r, int g, int b);
 	void set_fog();
 	bool is_fogged() const;
 	const fog& get_fog() const;

code/graphics/opengl/es_compatibility.h

@@ -27,6 +27,10 @@
 #define GL_UNSIGNED_INT_8_8_8_8_REV				0x8367
 #define GL_BGR									0x80E0
 #define GL_MULTISAMPLE							0x809D
+#define GL_CLAMP_READ_COLOR						0x891C
+#define GL_CLAMP_VERTEX_COLOR					0x891A
+#define GL_CLAMP_FRAGMENT_COLOR					0x891B
+#define GL_FIXED_ONLY							0x891D
 
 //Enums Redefinitions
 #define GL_CLIP_DISTANCE0						GL_CLIP_DISTANCE0_EXT // GL_EXT_clip_cull_distance
@@ -268,6 +272,8 @@ static inline void glTexImage2D(GLenum target, GLint level, GLint internalformat
 		glad_glTexImage2D(target, level, internalformat, width, height, border, GL_RGBA, GL_UNSIGNED_BYTE, data);
 	} else if (internalformat == GL_DEPTH_COMPONENT24) {
 		glad_glTexImage2D(target, level, internalformat, width, height, border, format, GL_UNSIGNED_INT, data);
+	} else if (internalformat == GL_DEPTH24_STENCIL8) {
+		glad_glTexImage2D(target, level, internalformat, width, height, border, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, data);
 	} else {
 		glad_glTexImage2D(target, level, internalformat, width, height, border, format, type, data);
 	}
@@ -307,6 +313,9 @@ static inline void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
 	Missing functions for ES 3.2 compatibility 
 */
 
+// Used during screenshots, that dont work anyway.
+#define glClampColor(target, clamp) ((void)0)
+
 // Not present on ES, emulating with glDrawBuffers
 // Positional mapping: element i must be COLOR_ATTACHMENTi o NONE.
 // ONLY for blits/clears. For draw calls the location of frag shader