1 files changed, 61 insertions, 48 deletions

diff --git a/linden/indra/llrender/llpostprocess.cpp b/linden/indra/llrender/llpostprocess.cpp
index c884951..92a0854 100644
--- a/linden/indra/llrender/llpostprocess.cpp
+++ b/linden/indra/llrender/llpostprocess.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -51,12 +51,14 @@ static const float LUMINANCE_B = 0.114f;
 static const char * const XML_FILENAME = "postprocesseffects.xml";
 
 LLPostProcess::LLPostProcess(void) : 
-                                        sceneRenderTexture(0), noiseTexture(0),
-                                        tempBloomTexture(0),
                                         initialized(false),  
                                         mAllEffects(LLSD::emptyMap()),
                                         screenW(1), screenH(1)
 {
+        mSceneRenderTexture = NULL ; 
+        mNoiseTexture = NULL ;
+        mTempBloomTexture = NULL ;
+                                        
         /*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
         std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
         LL_DEBUGS2("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL;
@@ -110,9 +112,7 @@ LLPostProcess::LLPostProcess(void) :
 
 LLPostProcess::~LLPostProcess(void)
 {
-        glDeleteTextures(1, &sceneRenderTexture);
-        glDeleteTextures(1, &noiseTexture);
-        glDeleteTextures(1, &tempBloomTexture);
+        invalidate() ;
 }
 
 // static
@@ -157,6 +157,13 @@ void LLPostProcess::saveEffect(std::string const & effectName)
         formatter->format(mAllEffects, effectsXML);
         */
 }
+void LLPostProcess::invalidate()
+{
+        mSceneRenderTexture = NULL ;
+        mNoiseTexture = NULL ;
+        mTempBloomTexture = NULL ;
+        initialized = FALSE ;
+}
 
 void LLPostProcess::apply(unsigned int width, unsigned int height)
 {
@@ -172,7 +179,7 @@ void LLPostProcess::initialize(unsigned int width, unsigned int height)
 {
         screenW = width;
         screenH = height;
-        createTexture(sceneRenderTexture, screenW, screenH);
+        createTexture(mSceneRenderTexture, screenW, screenH);
         initialized = true;
 
         checkError();
@@ -198,16 +205,20 @@ void LLPostProcess::applyShaders(void)
         }       
         if (tweaks.useNightVisionShader()){
                 /// If any of the above shaders have been called update the frame buffer;
-                if (tweaks.useColorFilter()){
-                        copyFrameBuffer(sceneRenderTexture, screenW, screenH);
+                if (tweaks.useColorFilter())
+                {
+                        GLuint tex = mSceneRenderTexture->getTexName() ;
+                        copyFrameBuffer(tex, screenW, screenH);
                 }
                 applyNightVisionShader();
                 checkError();
         }
         if (tweaks.useBloomShader()){
                 /// If any of the above shaders have been called update the frame buffer;
-                if (tweaks.useColorFilter().asBoolean() || tweaks.useNightVisionShader().asBoolean()){
-                        copyFrameBuffer(sceneRenderTexture, screenW, screenH);
+                if (tweaks.useColorFilter().asBoolean() || tweaks.useNightVisionShader().asBoolean())
+                {
+                        GLuint tex = mSceneRenderTexture->getTexName() ;
+                        copyFrameBuffer(tex, screenW, screenH);
                 }
                 applyBloomShader();
                 checkError();
@@ -220,9 +231,9 @@ void LLPostProcess::applyColorFilterShader(void)
         gPostColorFilterProgram.bind();
 
         gGL.getTexUnit(0)->activate();
-        glEnable(GL_TEXTURE_RECTANGLE_ARB);     
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_RECT_TEXTURE);
 
-        glBindTexture(GL_TEXTURE_RECTANGLE_ARB, sceneRenderTexture);
+        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_RECT_TEXTURE, sceneRenderTexture);
 
         getShaderUniforms(colorFilterUniforms, gPostColorFilterProgram.mProgramObject);
         glUniform1iARB(colorFilterUniforms["RenderTexture"], 0);
@@ -264,16 +275,16 @@ void LLPostProcess::applyNightVisionShader(void)
         gPostNightVisionProgram.bind();
 
         gGL.getTexUnit(0)->activate();
-        glEnable(GL_TEXTURE_RECTANGLE_ARB);     
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_RECT_TEXTURE);
 
         getShaderUniforms(nightVisionUniforms, gPostNightVisionProgram.mProgramObject);
-        glBindTexture(GL_TEXTURE_RECTANGLE_ARB, sceneRenderTexture);
+        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_RECT_TEXTURE, sceneRenderTexture);
         glUniform1iARB(nightVisionUniforms["RenderTexture"], 0);
 
         gGL.getTexUnit(1)->activate();
-        glEnable(GL_TEXTURE_2D);        
+        gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);       
 
-        glBindTexture(GL_TEXTURE_2D, noiseTexture);
+        gGL.getTexUnit(1)->bindManual(LLTexUnit::TT_TEXTURE, noiseTexture);
         glUniform1iARB(nightVisionUniforms["NoiseTexture"], 1);
 
         
@@ -305,7 +316,7 @@ void LLPostProcess::createNightVisionShader(void)
         nightVisionUniforms["noiseStrength"] = 0;
         nightVisionUniforms["lumWeights"] = 0;  
 
-        createNoiseTexture(noiseTexture);
+        createNoiseTexture(mNoiseTexture);
 }
 
 void LLPostProcess::applyBloomShader(void)
@@ -315,7 +326,7 @@ void LLPostProcess::applyBloomShader(void)
 
 void LLPostProcess::createBloomShader(void)
 {
-        createTexture(tempBloomTexture, unsigned(screenW * 0.5), unsigned(screenH * 0.5));
+        createTexture(mTempBloomTexture, unsigned(screenW * 0.5), unsigned(screenH * 0.5));
 
         /// Create Bloom Extract Shader
         bloomExtractUniforms["RenderTexture"] = 0;
@@ -347,7 +358,10 @@ void LLPostProcess::doEffects(void)
         glPushClientAttrib(GL_ALL_ATTRIB_BITS);
 
         /// Copy the screen buffer to the render texture
-        copyFrameBuffer(sceneRenderTexture, screenW, screenH);
+        {
+                GLuint tex = mSceneRenderTexture->getTexName() ;
+                copyFrameBuffer(tex, screenW, screenH);
+        }
 
         /// Clear the frame buffer.
         glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
@@ -373,7 +387,7 @@ void LLPostProcess::doEffects(void)
 
 void LLPostProcess::copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height)
 {
-        glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
+        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_RECT_TEXTURE, texture);
         glCopyTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, 0, 0, width, height, 0);
 }
 
@@ -478,43 +492,42 @@ void LLPostProcess::changeOrthogonal(unsigned int width, unsigned int height)
         viewOrthogonal(width, height);
 }
 
-void LLPostProcess::createTexture(GLuint & texture, unsigned int width, unsigned int height)
+void LLPostProcess::createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height)
 {
-        if (texture != 0){
-                glDeleteTextures(1, &texture);
-        }
+        std::vector<GLubyte> data(width * height * 4, 0) ;
 
-        std::vector<GLubyte> data(width * height * 4, 0);
-
-        glGenTextures(1, &texture);
-        glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
-        glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 4, width, height, 0,
-                GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
-        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-}
-
-void LLPostProcess::createNoiseTexture(GLuint & texture)
-{
-        if (texture != 0){
-                glDeleteTextures(1, &texture);
+        texture = new LLImageGL(FALSE) ;        
+        if(texture->createGLTexture())
+        {
+                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_RECT_TEXTURE, texture->getTexName());
+                glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 4, width, height, 0,
+                        GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
+                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
         }
-        glGenTextures(1, &texture);
+}
 
+void LLPostProcess::createNoiseTexture(LLPointer<LLImageGL>& texture)
+{       
         std::vector<GLubyte> buffer(NOISE_SIZE * NOISE_SIZE);
         for (unsigned int i = 0; i < NOISE_SIZE; i++){
                 for (unsigned int k = 0; k < NOISE_SIZE; k++){
                         buffer[(i * NOISE_SIZE) + k] = (GLubyte)((double) rand() / ((double) RAND_MAX + 1.f) * 255.f);
                 }
         }
-        glBindTexture(GL_TEXTURE_2D, texture);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,GL_LINEAR);
-        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);
+
+        texture = new LLImageGL(FALSE) ;
+        if(texture->createGLTexture())
+        {
+                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, texture->getTexName());
+                glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+                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);
+        }
 }
 
 bool LLPostProcess::checkError(void)