Ticket #3641: glsl-detect.2.patch

binaries/data/mods/mod/hwdetect/hwdetect.js

@@ -1 @@
-/* Copyright (c) 2013 Wildfire Games
+/* Copyright (c) 2015 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -180 +180 @@
     var disable_shadowpcf = undefined;
     var disable_allwater = undefined;
     var disable_fancywater = undefined;
+    var enable_glsl = undefined;
     var override_renderpath = undefined;
 
     // TODO: add some mechanism for setting config values
@@ -209 +210 @@
     var GL_VERSION = settings.GL_VERSION;
     var GL_EXTENSIONS = settings.GL_EXTENSIONS.split(" ");
 
+    // enable GLSL on OpenGL 3+
+    if (GL_VERSION.match(/^[3-9]/))
+        enable_glsl = true;
 
     // NVIDIA 260.19.* UNIX drivers cause random crashes soon after startup.
     // http://www.wildfiregames.com/forum/index.php?showtopic=13668
@@ -293 +297 @@
         "disable_shadowpcf": disable_shadowpcf,
         "disable_allwater": disable_allwater,
         "disable_fancywater": disable_fancywater,
+        "enable_glsl": enable_glsl,
         "override_renderpath": override_renderpath,
     };
 }
@@ -332 +337 @@
     if (output.disable_fancywater !== undefined)
         Engine.SetDisableFancyWater(output.disable_fancywater);
 
+    if (output.enable_glsl !== undefined)
+        Engine.SetEnableGLSL(output.enable_glsl);
+
     if (output.override_renderpath !== undefined)
         Engine.SetRenderPath(output.override_renderpath);
 };

source/ps/GameSetup/Config.cpp

@@ -51 +51 @@
 bool g_Silhouettes = false;
 bool g_ShowSky = false;
 
+bool g_PreferGLSL = false;
+
 float g_Gamma = 1.0f;
 
 CStr g_RenderPath = "default";

source/ps/GameSetup/Config.h

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -72 +72 @@
 // flag to switch on sky rendering
 extern bool g_ShowSky;
 
+// Prefer GLSL shaders over ARB shaders
+extern bool g_PreferGLSL;
+
 extern float g_Gamma;
 // name of configured render path (depending on OpenGL extensions, this may not be
 // the render path that is actually in use right now)

source/ps/GameSetup/GameSetup.cpp

@@ -617 +617 @@
     g_Renderer.SetOptionBool(CRenderer::OPT_PARTICLES, g_Particles);
     g_Renderer.SetOptionBool(CRenderer::OPT_SILHOUETTES, g_Silhouettes);
     g_Renderer.SetOptionBool(CRenderer::OPT_SHOWSKY, g_ShowSky);
+    g_Renderer.SetOptionBool(CRenderer::OPT_PREFERGLSL, g_PreferGLSL);
 
     // create terrain related stuff
     new CTerrainTextureManager;

source/ps/GameSetup/HWDetect.cpp

@@ -172 +172 @@
         g_WaterShadows = !disabled;
 }
 
+void SetEnableGLSL(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), bool enabled)
+{
+    if (!IsOverridden("preferglsl"))
+        g_PreferGLSL = enabled;
+}
+
 void SetRenderPath(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), std::string renderpath)
 {
     g_RenderPath = renderpath;
@@ -191 +197 @@
     scriptInterface.RegisterFunction<void, bool, &SetDisableShadowPCF>("SetDisableShadowPCF");
     scriptInterface.RegisterFunction<void, bool, &SetDisableAllWater>("SetDisableAllWater");
     scriptInterface.RegisterFunction<void, bool, &SetDisableFancyWater>("SetDisableFancyWater");
+    scriptInterface.RegisterFunction<void, bool, &SetEnableGLSL>("SetEnableGLSL");
     scriptInterface.RegisterFunction<void, std::string, &SetRenderPath>("SetRenderPath");
 
     // Load the detection script: