Ticket #2692: red_water_patch.diff

source/renderer/Renderer.cpp

@@ -667 +667 @@
     m_Height = height;
     
     m->postprocManager.Resize();
+    
+    m_WaterManager->Resize();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////

source/renderer/WaterManager.cpp

@@ -293 +293 @@
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, (GLsizei)g_Renderer.GetWidth(), (GLsizei)g_Renderer.GetHeight(), 0,  GL_RGBA, GL_UNSIGNED_SHORT, NULL);
 
     glGenTextures(1, &m_FancyTextureOther);
     glBindTexture(GL_TEXTURE_2D, m_FancyTextureOther);
@@ -301 +300 @@
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, (GLsizei)g_Renderer.GetWidth(), (GLsizei)g_Renderer.GetHeight(), 0,  GL_RGBA, GL_UNSIGNED_SHORT, NULL);
 
     glGenTextures(1, &m_FancyTextureDepth);
     glBindTexture(GL_TEXTURE_2D, m_FancyTextureDepth);
@@ -309 +307 @@
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexImage2D( GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32, (GLsizei)g_Renderer.GetWidth(), (GLsizei)g_Renderer.GetHeight(), 0,  GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, NULL);
-    
+
     glBindTexture(GL_TEXTURE_2D, 0);
-    
+
+    Resize();
+
     // Create the water framebuffers
-    
+
     GLint currentFbo;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &currentFbo);
 
@@ -373 +372 @@
 
 
 ///////////////////////////////////////////////////////////////////
+// Resize: Updates the fancy water textures.
+void WaterManager::Resize()
+{
+    glBindTexture(GL_TEXTURE_2D, m_FancyTextureNormal);
+    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, (GLsizei)g_Renderer.GetWidth(), (GLsizei)g_Renderer.GetHeight(), 0,  GL_RGBA, GL_UNSIGNED_SHORT, NULL);
+
+    glBindTexture(GL_TEXTURE_2D, m_FancyTextureOther);
+    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, (GLsizei)g_Renderer.GetWidth(), (GLsizei)g_Renderer.GetHeight(), 0,  GL_RGBA, GL_UNSIGNED_SHORT, NULL);
+
+    glBindTexture(GL_TEXTURE_2D, m_FancyTextureDepth);
+    glTexImage2D( GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32, (GLsizei)g_Renderer.GetWidth(), (GLsizei)g_Renderer.GetHeight(), 0,  GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, NULL);
+
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+
+///////////////////////////////////////////////////////////////////
 // Unload water textures
 void WaterManager::UnloadWaterTextures()
 {

source/renderer/WaterManager.h

@@ -136 +136 @@
      * if more textures need to be loaded and a negative error value on failure.
      */
     int LoadWaterTextures();
-    
+
     /**
+     * Resize: Updates the fancy water textures so that water will render correctly
+     * with fancy water.
+     */
+    void Resize();
+
+    /**
      * UnloadWaterTextures: Free any loaded water textures and reset the internal state
      * so that another call to LoadWaterTextures will begin progressive loading.
      */