Index: ps/trunk/source/renderer/RenderingOptions.cpp
===================================================================
--- ps/trunk/source/renderer/RenderingOptions.cpp	(revision 24100)
+++ ps/trunk/source/renderer/RenderingOptions.cpp	(revision 24101)
@@ -1,147 +1,161 @@
 /* Copyright (C) 2020 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "RenderingOptions.h"
 
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/CStr.h"
 #include "renderer/Renderer.h"
 
 SRenderingOptions g_RenderingOptions;
 
 RenderPath RenderPathEnum::FromString(const CStr8& name)
 {
 	if (name == "default")
 		return DEFAULT;
 	if (name == "fixed")
 		return FIXED;
 	if (name == "shader")
 		return SHADER;
 
 	LOGWARNING("Unknown render path %s", name.c_str());
 	return DEFAULT;
 }
 
 CStr8 RenderPathEnum::ToString(RenderPath path)
 {
 	switch (path)
 	{
 	case RenderPath::DEFAULT:
 		return "default";
 	case RenderPath::FIXED:
 		return "fixed";
 	case RenderPath::SHADER:
 		return "shader";
 	}
 	return "default"; // Silence warning about reaching end of non-void function.
 }
 
 SRenderingOptions::SRenderingOptions()
 {
 	m_NoVBO = false;
 	m_RenderPath = RenderPath::DEFAULT;
 	m_Shadows = false;
 	m_WaterEffects = false;
 	m_WaterFancyEffects = false;
 	m_WaterRealDepth = false;
 	m_WaterRefraction = false;
 	m_WaterReflection = false;
 	m_WaterShadows = false;
 	m_ShadowAlphaFix = true;
 	m_ARBProgramShadow = true;
 	m_ShadowPCF = false;
 	m_Particles = false;
 	m_Silhouettes = false;
 	m_PreferGLSL = false;
 	m_Fog = false;
 	m_ForceAlphaTest = false;
 	m_GPUSkinning = false;
 	m_SmoothLOS = false;
 	m_PostProc = false;
 	m_ShowSky = false;
 	m_DisplayFrustum = false;
 	m_DisplayShadowsFrustum = false;
 	m_RenderActors = true;
 }
 
 void SRenderingOptions::ReadConfig()
 {
 	CFG_GET_VAL("shadows", m_Shadows);
 	CFG_GET_VAL("shadowpcf", m_ShadowPCF);
 
 	CFG_GET_VAL("preferglsl", m_PreferGLSL);
 	CFG_GET_VAL("postproc", m_PostProc);
 	CFG_GET_VAL("smoothlos", m_SmoothLOS);
 
 	CStr renderPath;
 	CFG_GET_VAL("renderpath", renderPath);
 	SetRenderPath(RenderPathEnum::FromString(renderPath));
 
 	CFG_GET_VAL("watereffects", m_WaterEffects);
 	CFG_GET_VAL("waterfancyeffects", m_WaterFancyEffects);
 	CFG_GET_VAL("waterrealdepth", m_WaterRealDepth);
 	CFG_GET_VAL("waterrefraction", m_WaterRefraction);
 	CFG_GET_VAL("waterreflection", m_WaterReflection);
 	CFG_GET_VAL("watershadows", m_WaterShadows);
 
 	CFG_GET_VAL("particles", m_Particles);
 	CFG_GET_VAL("fog", m_Fog);
 	CFG_GET_VAL("silhouettes", m_Silhouettes);
 	CFG_GET_VAL("showsky", m_ShowSky);
 
 	CFG_GET_VAL("novbo", m_NoVBO);
 
 	CFG_GET_VAL("forcealphatest", m_ForceAlphaTest);
 	CFG_GET_VAL("gpuskinning", m_GPUSkinning);
 
 	CFG_GET_VAL("renderactors", m_RenderActors);
+
+	if (m_GPUSkinning && !m_PreferGLSL)
+	{
+		LOGWARNING("GPUSkinning have been disabled, because it is not supported with PreferGLSL disabled.");
+		m_GPUSkinning = false;
+	}
 }
 
 void SRenderingOptions::SetShadows(bool value)
 {
 	m_Shadows = value;
 	g_Renderer.MakeShadersDirty();
 }
 
 void SRenderingOptions::SetShadowPCF(bool value)
 {
 	m_ShadowPCF = value;
 	g_Renderer.MakeShadersDirty();
 }
 
 void SRenderingOptions::SetFog(bool value)
 {
 	m_Fog = value;
 	g_Renderer.MakeShadersDirty();
 }
 
 void SRenderingOptions::SetPreferGLSL(bool value)
 {
+	if (m_GPUSkinning && !value)
+	{
+		LOGWARNING("GPUSkinning have been disabled, because it is not supported with PreferGLSL disabled.");
+		m_GPUSkinning = false;
+	}
+	else if (!m_GPUSkinning && value)
+		CFG_GET_VAL("gpuskinning", m_GPUSkinning);
+
 	m_PreferGLSL = value;
 	g_Renderer.MakeShadersDirty();
 	g_Renderer.RecomputeSystemShaderDefines();
 }
 
 
 void SRenderingOptions::SetRenderPath(RenderPath value)
 {
 	m_RenderPath = value;
 	g_Renderer.SetRenderPath(m_RenderPath);
 }