Index: binaries/data/mods/mod/hwdetect/hwdetect.js
===================================================================
--- binaries/data/mods/mod/hwdetect/hwdetect.js
+++ binaries/data/mods/mod/hwdetect/hwdetect.js
@@ -20,208 +20,66 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/*
-
-This script is for adjusting the game's default settings based on the
-user's system configuration details.
-
-The game engine itself does some detection of capabilities, so it will
-enable certain graphical features only when they are supported.
-This script is for the messier task of avoiding performance problems
-and driver bugs based on experience of particular system configurations.
-
+/* This script is for adjusting the game's default settings based on the
+ * user's system configuration details.
+ * The game engine itself does some detection of capabilities, so it will
+ * enable certain graphical features only when they are supported.
+ * This script is for the messier task of avoiding performance problems
+ * and driver bugs based on experience of particular system configurations.
 */
 
-var g_IntelMesaChipsets = [
-	"Intel(R) 845G",
-	"Intel(R) 830M",
-	"Intel(R) 852GM/855GM",
-	"Intel(R) 865G",
-	"Intel(R) 915G",
-	"Intel (R) E7221G (i915)",
-	"Intel(R) 915GM",
-	"Intel(R) 945G",
-	"Intel(R) 945GM",
-	"Intel(R) 945GME",
-	"Intel(R) G33",
-	"Intel(R) Q35",
-	"Intel(R) Q33",
-	"Intel(R) IGD",
-	"Intel(R) 965Q",
-	"Intel(R) 965G",
-	"Intel(R) 946GZ",
-	"Intel(R) GMA500", // not in current Mesa
-	"Intel(R) 965GM",
-	"Intel(R) 965GME/GLE",
-	"Mobile Intel\xC2\xAE GM45 Express Chipset", // utf-8 decoded as iso-8859-1
-	"Intel(R) Integrated Graphics Device",
-	"Intel(R) G45/G43",
-	"Intel(R) Q45/Q43",
-	"Intel(R) G41",
-	"Intel(R) B43",
-	"Intel(R) IGDNG_D", // not in current Mesa; looks somewhat like Ironlake
-	"Intel(R) IGDNG_M", // not in current Mesa; looks somewhat like Ironlake
-	"Intel(R) Ironlake Desktop",
-	"Intel(R) Ironlake Mobile",
-	"Intel(R) Sandybridge Desktop",
-	"Intel(R) Sandybridge Mobile",
-	"Intel(R) Sandybridge Server",
-	"Intel(R) Ivybridge Desktop",
-	"Intel(R) Ivybridge Mobile",
-	"Intel(R) Ivybridge Server",
-	"Intel(R) Haswell Desktop",
-	"Intel(R) Haswell Mobile",
-	"Intel(R) Haswell Server",
-	"Unknown Intel Chipset",
-	"*", // dummy value to support IsWorseThanIntelMesa("*") to detect all Intel Mesa devices
-];
-// Originally generated from Mesa with
-//   perl -lne'print "\t$1," if /chipset = (".*")/' src/mesa/drivers/dri/intel/intel_context.c
-// Assumed to be roughly ordered by performance.
-
-var g_IntelWindowsChipsets = [
-	"Intel 845G",
-	"Intel 855GM",
-	"Intel 865G",
-	"Intel 915G",
-	"Intel 915GM",
-	"Intel 945G",
-	"Intel 945GM",
-	"Intel 965/963 Graphics Media Accelerator",
-	"Intel Broadwater G",
-	"Intel Bear Lake B",
-	"Intel Pineview Platform",
-	"Intel Eaglelake",
-	"Intel(R) G41 Express Chipset", // Eaglelake
-	"Intel(R) G45/G43 Express Chipset", // Eaglelake
-	"Intel Cantiga",
-	"Mobile Intel(R) 4 Series Express Chipset Family", // probably Cantiga
-	"Intel(R) HD Graphics", // probably Ironlake
-	"Intel(R) Graphics Media Accelerator HD", // no idea
-	"*",
-];
-// Determined manually from data reports.
-// See http://en.wikipedia.org/wiki/Intel_GMA for useful listing.
-
-var g_IntelMacChipsets = [
-	"Intel GMA 950",
-	"Intel GMA X3100",
-	"Intel HD Graphics",
-	"Intel HD Graphics 3000",
-	"Unknown Intel Chipset",
-	"*",
-];
-// Determined manually from data reports.
-// See http://support.apple.com/kb/HT3246 for useful listing.
-
-function IsWorseThanIntelMesa(renderer, chipset)
-{
-	var target = g_IntelMesaChipsets.indexOf(chipset);
-	if (target == -1)
-		error("Invalid chipset "+chipset);
-
-	// GL_RENDERER is "Mesa DRI $chipset" or "Mesa DRI $chipset $otherstuff"
-	for (var i = 0; i < target; ++i)
-	{
-		var str = "Mesa DRI " + g_IntelMesaChipsets[i];
-		if (renderer == str || renderer.substr(0, str.length+1) == str+" ")
-			return true;
-	}
-
-	return false;
-}
-
-function IsWorseThanIntelWindows(renderer, chipset)
-{
-	var target = g_IntelWindowsChipsets.indexOf(chipset);
-	if (target == -1)
-		error("Invalid chipset "+chipset);
-
-	var match = g_IntelWindowsChipsets.indexOf(renderer);
-	if (match != -1 && match < target)
-		return true;
-
-	return false;
-}
-
-function IsWorseThanIntelMac(renderer, chipset)
-{
-	var target = g_IntelMacChipsets.indexOf(chipset);
-	if (target == -1)
-		error("Invalid chipset "+chipset);
-
-	// GL_RENDERER is "$chipset OpenGL Engine"
-	for (var i = 0; i < target; ++i)
-	{
-		var str = g_IntelMacChipsets[i]+" OpenGL Engine";
-		if (renderer == str)
-			return true;
-	}
-
-	return false;
-}
-
 function RunDetection(settings)
 {
 	// This function should have no side effects, it should just
 	// set these output properties:
 
-
 	// List of warning strings to display to the user
 	// in an ugly GUI dialog box
-	var dialog_warnings = [];
+	let dialog_warnings = [];
 
 	// List of warning strings to log
-	var warnings = [];
+	let warnings = [];
 
 	// If variable value is not undefined it overrides default.cfg,
 	// local preferences have a higher priority anyway
-	var disable_audio = undefined;
-	var disable_s3tc = undefined;
-	var disable_shadows = undefined;
-	var disable_shadowpcf = undefined;
-	var disable_allwater = undefined;
-	var disable_fancywater = undefined;
-	var enable_glsl = undefined;
-	var enable_postproc = undefined;
-	var enable_smoothlos = undefined;
-	var override_renderpath = undefined;
+	let disable_s3tc = undefined;
+	let disable_shadows = undefined;
+	let disable_shadowpcf = undefined;
+	let disable_allwater = undefined;
+	let disable_fancywater = undefined;
+	let enable_glsl = undefined;
+	let enable_postproc = undefined;
+	let enable_smoothlos = undefined;
+	let override_renderpath = undefined;
 
 	// TODO: add some mechanism for setting config values
 	// (overriding default.cfg, but overridden by local.cfg)
 
-
-
 	// Extract all the settings we might use from the argument:
 	// (This is less error-prone than referring to "settings.foo" directly
 	// since typos in the matching code will be caught as references to
 	// undefined variables.)
 
 	// OS flags (0 or 1)
-	var os_unix = settings.os_unix;
-	var os_linux = settings.os_linux;
-	var os_macosx = settings.os_macosx;
-	var os_win = settings.os_win;
-
-	// Should avoid using these, since they're disabled in quickstart mode
-	var gfx_card = settings.gfx_card;
-	var gfx_drv_ver = settings.gfx_drv_ver;
-	var gfx_mem = settings.gfx_mem;
+	let os_linux = settings.os_linux;
+	let os_macosx = settings.os_macosx;
+	let os_win = settings.os_win;
 
 	// Values from glGetString
-	var GL_VENDOR = settings.GL_VENDOR;
-	var GL_RENDERER = settings.GL_RENDERER;
-	var GL_VERSION = settings.GL_VERSION;
-	var GL_EXTENSIONS = settings.GL_EXTENSIONS.split(" ");
+	let GL_RENDERER = settings.GL_RENDERER;
+	let GL_VERSION = settings.GL_VERSION;
+
+	// Extract the OpenGL API version from the GL_VERSION string.
+	let gl_major_version = +GL_VERSION.match(/^\d*/)[0];
 
 	// Enable GLSL on OpenGL 3+, which should be able to properly
 	// manage GLSL shaders, needed for effects like windy trees
-	if (GL_VERSION.match(/^[3-9]/))
+	if (gl_major_version >= 3)
 		enable_glsl = true;
 
 	// Enable most graphics options on OpenGL 4+, which should be
 	// able to properly manage them
-	if (GL_VERSION.match(/^[4-9]/))
+	if (gl_major_version >= 4)
 	{
 		enable_postproc = true;
 		enable_smoothlos = true;
@@ -248,7 +106,7 @@
 	// http://www.wildfiregames.com/forum/index.php?showtopic=13668
 	// Fixed in 260.19.21:
 	//   "Fixed a race condition in OpenGL that could cause crashes with multithreaded applications."
-	if (os_unix && GL_VERSION.match(/NVIDIA 260\.19\.(0[0-9]|1[0-9]|20)$/))
+	if (os_linux && GL_VERSION.match(/NVIDIA 260\.19\.(0[0-9]|1[0-9]|20)$/))
 	{
 		dialog_warnings.push("You are using 260.19.* series NVIDIA drivers, which may crash the game. Please upgrade to 260.19.21 or later.");
 	}
@@ -258,7 +116,7 @@
 	// R600 drivers will advertise support for S3TC but not actually support it,
 	// and will draw everything in grey instead, so forcibly disable S3TC.
 	// (We should add a version check once there's a version that does support it properly.)
-	if (os_unix && GL_RENDERER.match(/^Mesa DRI R600 /))
+	if (os_linux && GL_RENDERER.match(/^Mesa DRI R600 /))
 		disable_s3tc = true;
 
 	// http://trac.wildfiregames.com/ticket/623
@@ -267,34 +125,26 @@
 	//   Intel 945
 	// Shadows are also known to be quite slow on some others:
 	//   Intel 4500MHD
-	// In the interests of performance, we'll disable them on lots of devices
-	// (with a fairly arbitrary cutoff for Intels)
-	if (
-		(os_unix && GL_RENDERER.match(/^Mesa DRI R[123]00 /)) ||
-		(os_macosx && IsWorseThanIntelMac(GL_RENDERER, "Intel HD Graphics 3000")) ||
-		(os_unix && IsWorseThanIntelMesa(GL_RENDERER, "Intel(R) Ironlake Desktop")) ||
-		(os_win && IsWorseThanIntelWindows(GL_RENDERER, "Intel(R) HD Graphics"))
+	// In the interests of performance, we'll disable them on lots of devices.
+	if (os_linux && GL_RENDERER.match(/^Mesa DRI R[123]00 /) || GL_RENDERER.match(/Intel/) &&
+		((os_macosx && (GL_RENDERER.match(/GMA/) || gl_major_version < 2) ||
+		(os_linux || os_win) && gl_major_version < 3 && !GL_RENDERER.match(/Intel(R) HD/)))
 	)
 	{
 		disable_shadows = true;
 		disable_shadowpcf = true;
 	}
 
-	// Fragment-shader water is really slow on most Intel devices (especially the
-	// "use actual depth" option), so disable it on all of them
-	if (
-		(os_macosx && IsWorseThanIntelMac(GL_RENDERER, "*")) ||
-		(os_unix && IsWorseThanIntelMesa(GL_RENDERER, "*")) ||
-		(os_win && IsWorseThanIntelWindows(GL_RENDERER, "*"))
-	)
+	// Fragment-shader water is really slow on older Intel devices,
+	// so disable it on Intel hardware which doesn't support GL 4.
+	if (GL_RENDERER.match(/Intel/) && gl_major_version < 4)
 	{
 		disable_fancywater = true;
-		disable_shadowpcf = true;
 	}
 
 	// http://trac.wildfiregames.com/ticket/780
 	// r300 classic has problems with shader mode, so fall back to non-shader
-	if (os_unix && GL_RENDERER.match(/^Mesa DRI R[123]00 /))
+	if (os_linux && GL_RENDERER.match(/^Mesa DRI R[123]00 /))
 	{
 		override_renderpath = "fixed";
 		warnings.push("Some graphics features are disabled, due to bugs in old graphics drivers. Upgrading to a Gallium-based driver might help.");
@@ -320,7 +170,6 @@
 	return {
 		"dialog_warnings": dialog_warnings,
 		"warnings": warnings,
-		"disable_audio": disable_audio,
 		"disable_s3tc": disable_s3tc,
 		"disable_shadows": disable_shadows,
 		"disable_shadowpcf": disable_shadowpcf,
@@ -337,22 +186,19 @@
 {
 	//print(JSON.stringify(settings, null, 1)+"\n");
 
-	var output = RunDetection(settings);
+	let output = RunDetection(settings);
 
 	//print(JSON.stringify(output, null, 1)+"\n");
 
-	for (var i = 0; i < output.warnings.length; ++i)
+	for (let i = 0; i < output.warnings.length; ++i)
 		warn(output.warnings[i]);
 
 	if (output.dialog_warnings.length)
 	{
-		var msg = output.dialog_warnings.join("\n\n");
+		let msg = output.dialog_warnings.join("\n\n");
 		Engine.DisplayErrorDialog(msg);
 	}
 
-	if (output.disable_audio !== undefined)
-		Engine.SetDisableAudio(output.disable_audio);
-
 	if (output.disable_s3tc !== undefined)
 		Engine.SetDisableS3TC(output.disable_s3tc);
 
Index: binaries/data/mods/mod/hwdetect/test.js
===================================================================
--- binaries/data/mods/mod/hwdetect/test.js
+++ binaries/data/mods/mod/hwdetect/test.js
@@ -1,43 +1,26 @@
-// Run in a standalone JS shell like
-//   js -e 'var global={}' -f hwdetect.js -f test_data.js -f test.js > output.html
-// where test_data.js is a giant file that's probably not publicly available yet
-// (ask Philip if you want a copy), then look at output.html and make sure it's
-// applying the hwdetected settings in the appropriate cases
+// Run in a standalone JS shell like:
+// js -e 'var global={}' -f hwdetect.js -f test.js
 
-print("<!DOCTYPE html>");
-print("<meta charset=utf-8>");
-print("<style>body { font: 8pt sans-serif; }</style>");
-print("<table>");
-print("<tr>");
-print("<th>OS");
-print("<th>GL_RENDERER");
-print("<th>Output");
-print("<th>Warnings");
+// Add settings to test below.
+let testSettings = [
+	{os_linux: 1, os_macosx: 0, os_win: 0, GL_RENDERER: "Intel", GL_VERSION: "4.5"},
+	{os_linux: 1, os_macosx: 0, os_win: 0, GL_RENDERER: "Intel", GL_VERSION: "3.3"},
+	{os_linux: 1, os_macosx: 0, os_win: 0, GL_RENDERER: "Intel", GL_VERSION: "2.1"},
+	{os_linux: 1, os_macosx: 0, os_win: 0, GL_RENDERER: "", GL_VERSION: "4.5"},
+	{os_linux: 1, os_macosx: 0, os_win: 0, GL_RENDERER: "", GL_VERSION: "3.3"},
+	{os_linux: 0, os_macosx: 1, os_win: 0, GL_RENDERER: "Intel", GL_VERSION: "2.1"},
+	{os_linux: 0, os_macosx: 1, os_win: 0, GL_RENDERER: "Intel", GL_VERSION: "1.4"},
+	{os_linux: 0, os_macosx: 0, os_win: 1, GL_RENDERER: "Intel", GL_VERSION: "4.5"},
+	{os_linux: 0, os_macosx: 0, os_win: 1, GL_RENDERER: "Intel", GL_VERSION: "2.0"},
+];
 
-hwdetectTestData.sort(function(a, b) {
-	if (a.GL_RENDERER < b.GL_RENDERER)
-		return -1;
-	if (b.GL_RENDERER < a.GL_RENDERER)
-		return +1;
-	return 0;
-});
-
-for (var settings of hwdetectTestData)
+for (let settings of testSettings)
 {
-	var output = RunDetection(settings);
-
-	var os = (settings.os_linux ? "linux" : settings.os_macosx ? "macosx" : settings.os_win ? "win" : "???");
+	print("OS: " + (settings.os_linux ? "os_linux" : settings.os_macosx ? "os_macosx" : settings.os_win ? "os_win" : "unknown os") +
+		", GL_RENDERER: " + settings.GL_RENDERER + ", GL_VERSION: " + settings.GL_VERSION);
 
-	var disabled = [];
-	for (var d of ["disable_audio", "disable_s3tc", "disable_shadows", "disable_shadowpcf", "disable_allwater", "disable_fancywater", "override_renderpath"])
-		if (output[d] !== undefined)
-			disabled.push(d+"="+output[d])
+	let output = RunDetection(settings);
 
-	print("<tr>");
-	print("<td>" + os);
-	print("<td>" + settings.GL_RENDERER);
-	print("<td>" + disabled.join(" "));
-	print("<td>" + output.warnings.concat(output.dialog_warnings).join("\n"));
+	for (let option in output)
+		print(option + ": " + output[option]);
 }
-
-print("</table>");