Ticket #2513: LOSTexture.patch

source/graphics/LOSTexture.cpp

@@ -60 +60 @@
 CLOSTexture::CLOSTexture(CSimulation2& simulation) :
     m_Simulation(simulation), m_Dirty(true), m_Texture(0), m_smoothFbo(0), m_MapSize(0), m_TextureSize(0), whichTex(true)
 {
+    wasShaderInit = false;
     if (CRenderer::IsInitialised() && g_Renderer.m_Options.m_SmoothLOS)
     {
-        m_smoothShader = g_Renderer.GetShaderManager().LoadEffect(str_los_interp);
-        CShaderProgramPtr shader = m_smoothShader->GetShader();
-
-        if (m_smoothShader && shader)
-        {
-            pglGenFramebuffersEXT(1, &m_smoothFbo);
-        }
-        else
-        {
-            LOGERROR(L"Failed to load SmoothLOS shader, disabling.");
-            g_Renderer.m_Options.m_SmoothLOS = false;
-        }
+        CreateShader();
     }
 }
 
@@ -83 +73 @@
         DeleteTexture();
 }
 
+// Create the LOS texture engine.Only run once.
+void CLOSTexture::CreateShader()
+{
+    m_smoothShader = g_Renderer.GetShaderManager().LoadEffect(str_los_interp);
+    CShaderProgramPtr shader = m_smoothShader->GetShader();
+
+    // Check if the shader was created correctly
+    wasShaderInit = m_smoothShader && shader;
+    if (wasShaderInit)
+    {
+        pglGenFramebuffersEXT(1, &m_smoothFbo);
+    }
+    else
+    {
+        LOGERROR(L"Failed to load SmoothLOS shader, disabling.");
+        g_Renderer.m_Options.m_SmoothLOS = false;
+    }
+}
+
 void CLOSTexture::DeleteTexture()
 {
     glDeleteTextures(1, &m_Texture);
-    if (CRenderer::IsInitialised() && g_Renderer.m_Options.m_SmoothLOS)
-    {
+
+    if (m_TextureSmooth1)
         glDeleteTextures(1, &m_TextureSmooth1);
+
+    if (m_TextureSmooth2)
         glDeleteTextures(1, &m_TextureSmooth2);
-    }
+
     m_Texture = 0;
+    m_TextureSmooth1 = 0;
+    m_TextureSmooth2 = 0;
 }
 
 void CLOSTexture::MakeDirty()
@@ -120 +133 @@
 
 void CLOSTexture::InterpolateLOS()
 {
+    // Is the Renderer on and Smooth LOS active?
     if (CRenderer::IsInitialised() && !g_Renderer.m_Options.m_SmoothLOS)
         return;
-    
+
+    if (!wasShaderInit)
+    {
+        CreateShader();
+
+        // RecomputeTexture(0) will not cause the ConstructTexture to run.
+        // Force the textures to be created.
+        DeleteTexture();
+        ConstructTexture(0);
+        m_Dirty = true;
+    }
+
     if (m_Dirty)
     {
         RecomputeTexture(0);
         m_Dirty = false;
     }
-    
+
+    // Get the current return format for simple GL states
     GLint originalFBO;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &originalFBO);
     
+    // Bind the LOS framebuffer to GL_FRAMEBUFFER_EXT
     pglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_smoothFbo);
+
     pglFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, 
                    whichTex ? m_TextureSmooth2 : m_TextureSmooth1, 0);
     

source/graphics/LOSTexture.h

@@ -78 +78 @@
 
 private:
     void DeleteTexture();
+    void CreateShader();
     void ConstructTexture(int unit);
     void RecomputeTexture(int unit);
 
@@ -88 +89 @@
 
     bool m_Dirty;
 
+    bool wasShaderInit;
+
     GLuint m_Texture;
     GLuint m_TextureSmooth1, m_TextureSmooth2;