aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llpostprocess.h
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-11 16:10:39 -0600
committerJacek Antonelli2009-01-11 16:10:43 -0600
commita87e38229921b48c32187c672a942516722f1b52 (patch)
tree9e1dc0bc2318a9c6fa454bdb6d873a6af0e0ce3c /linden/indra/llrender/llpostprocess.h
parentSecond Life viewer sources 1.22.4-RC (diff)
downloadmeta-impy-a87e38229921b48c32187c672a942516722f1b52.zip
meta-impy-a87e38229921b48c32187c672a942516722f1b52.tar.gz
meta-impy-a87e38229921b48c32187c672a942516722f1b52.tar.bz2
meta-impy-a87e38229921b48c32187c672a942516722f1b52.tar.xz
Second Life viewer sources 1.22.5-RC
Diffstat (limited to 'linden/indra/llrender/llpostprocess.h')
-rw-r--r--linden/indra/llrender/llpostprocess.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/linden/indra/llrender/llpostprocess.h b/linden/indra/llrender/llpostprocess.h
index cd9f477..b191e9d 100644
--- a/linden/indra/llrender/llpostprocess.h
+++ b/linden/indra/llrender/llpostprocess.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2007&license=viewergpl$ 5 * $LicenseInfo:firstyear=2007&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2007-2008, Linden Research, Inc. 7 * Copyright (c) 2007-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -183,21 +183,24 @@ public:
183 183
184 }; 184 };
185 185
186 GLuint sceneRenderTexture;
187 GLuint noiseTexture;
188 GLuint tempBloomTexture;
189 bool initialized; 186 bool initialized;
190 PostProcessTweaks tweaks; 187 PostProcessTweaks tweaks;
191 188
192 // the map of all availible effects 189 // the map of all availible effects
193 LLSD mAllEffects; 190 LLSD mAllEffects;
194 191
192private:
193 LLPointer<LLImageGL> mSceneRenderTexture ;
194 LLPointer<LLImageGL> mNoiseTexture ;
195 LLPointer<LLImageGL> mTempBloomTexture ;
196
195public: 197public:
196 LLPostProcess(void); 198 LLPostProcess(void);
197 199
198 ~LLPostProcess(void); 200 ~LLPostProcess(void);
199 201
200 void apply(unsigned int width, unsigned int height); 202 void apply(unsigned int width, unsigned int height);
203 void invalidate() ;
201 204
202 /// Perform global initialization for this class. 205 /// Perform global initialization for this class.
203 static void initClass(void); 206 static void initClass(void);
@@ -251,9 +254,9 @@ private:
251 254
252 /// OpenGL Helper Functions 255 /// OpenGL Helper Functions
253 void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog); 256 void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog);
254 void createTexture(GLuint & texture, unsigned int width, unsigned int height); 257 void createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height);
255 void copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height); 258 void copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height);
256 void createNoiseTexture(GLuint & texture); 259 void createNoiseTexture(LLPointer<LLImageGL>& texture);
257 bool checkError(void); 260 bool checkError(void);
258 void checkShaderError(GLhandleARB shader); 261 void checkShaderError(GLhandleARB shader);
259 void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type); 262 void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type);