From 0a3eb94b4c854c2c08b02fcd4ad76f35fa42f572 Mon Sep 17 00:00:00 2001
From: Porteries Tristan <republicthunderbolt9@gmail.com>
Date: Mon, 25 Sep 2017 09:12:24 +0200
Subject: [PATCH] UPBGE: Don't enable fog.

Fog isn't enabled because it affect the render of geometry without
shaders, but the fog attributes are still updated and accessible to
the user. This behaviour is present from a long time in BFBGE and
previous UPBGE.
---
 source/gameengine/Ketsji/KX_WorldInfo.cpp                  | 2 --
 .../RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp          | 1 -
 .../Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h | 2 --
 source/gameengine/Rasterizer/RAS_Rasterizer.cpp            | 7 -------
 source/gameengine/Rasterizer/RAS_Rasterizer.h              | 2 --
 5 files changed, 14 deletions(-)

diff --git a/source/gameengine/Ketsji/KX_WorldInfo.cpp b/source/gameengine/Ketsji/KX_WorldInfo.cpp
index 27f4e074bccc..9dc619dafaef 100644
--- a/source/gameengine/Ketsji/KX_WorldInfo.cpp
+++ b/source/gameengine/Ketsji/KX_WorldInfo.cpp
@@ -193,11 +193,9 @@ void KX_WorldInfo::UpdateWorldSettings(RAS_Rasterizer *rasty)
 		if (m_hasmist) {
 			rasty->SetFog(m_misttype, m_miststart, m_mistdistance, m_mistintensity, m_con_mistcolor);
 			GPU_mist_update_values(m_misttype, m_miststart, m_mistdistance, m_mistintensity, m_mistcolor.getValue());
-			rasty->EnableFog(true);
 			GPU_mist_update_enable(true);
 		}
 		else {
-			rasty->EnableFog(false);
 			GPU_mist_update_enable(false);
 		}
 	}
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index f4e7ee9fdb7a..9d775280878c 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -62,7 +62,6 @@ static const int openGLEnableBitEnums[] = {
 	GL_BLEND, // RAS_BLEND
 	GL_COLOR_MATERIAL, // RAS_COLOR_MATERIAL
 	GL_CULL_FACE, // RAS_CULL_FACE
-	GL_FOG, // RAS_FOG
 	GL_LIGHTING, // RAS_LIGHTING
 	GL_MULTISAMPLE_ARB, // RAS_MULTISAMPLE
 	GL_POLYGON_STIPPLE, // RAS_POLYGON_STIPPLE
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index 4877e1cb35ad..0504c42ff7b6 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -97,8 +97,6 @@ class RAS_OpenGLRasterizer
 	void SetScissor(int x, int y, int width, int height);
 
 	void SetFog(short type, float start, float dist, float intensity, const MT_Vector3& color);
-	void EnableFog(bool enable);
-	void DisplayFog();
 
 	void SetLines(bool enable);
 
diff --git a/source/gameengine/Rasterizer/RAS_Rasterizer.cpp b/source/gameengine/Rasterizer/RAS_Rasterizer.cpp
index 82abff3ba236..8ad656b7166f 100644
--- a/source/gameengine/Rasterizer/RAS_Rasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_Rasterizer.cpp
@@ -266,11 +266,6 @@ void RAS_Rasterizer::SetFog(short type, float start, float dist, float intensity
 	m_impl->SetFog(type, start, dist, intensity, color);
 }
 
-void RAS_Rasterizer::EnableFog(bool enable)
-{
-	Enable(RAS_FOG);
-}
-
 void RAS_Rasterizer::Init()
 {
 	GPU_state_init();
@@ -348,8 +343,6 @@ void RAS_Rasterizer::EndFrame()
 	SetColorMask(true, true, true, true);
 
 	Disable(RAS_MULTISAMPLE);
-
-	Disable(RAS_FOG);
 }
 
 void RAS_Rasterizer::SetDrawingMode(RAS_Rasterizer::DrawType drawingmode)
diff --git a/source/gameengine/Rasterizer/RAS_Rasterizer.h b/source/gameengine/Rasterizer/RAS_Rasterizer.h
index f5871ece1864..56f50cc8507c 100644
--- a/source/gameengine/Rasterizer/RAS_Rasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_Rasterizer.h
@@ -178,7 +178,6 @@ class RAS_Rasterizer
 		RAS_BLEND,
 		RAS_COLOR_MATERIAL,
 		RAS_CULL_FACE,
-		RAS_FOG,
 		RAS_LIGHTING,
 		RAS_MULTISAMPLE,
 		RAS_POLYGON_STIPPLE,
@@ -584,7 +583,6 @@ class RAS_Rasterizer
 	 * Fog
 	 */
 	void SetFog(short type, float start, float dist, float intensity, const MT_Vector3& color);
-	void EnableFog(bool enable);
 	
 	/**
 	 * \param drawingmode = RAS_WIREFRAME, RAS_SOLID, RAS_SHADOW or RAS_TEXTURED.