diff options
author | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
commit | 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch) | |
tree | 95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/llrender/llrendertarget.cpp | |
parent | Second Life viewer sources 1.20.6 (diff) | |
download | meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2 meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz |
Second Life viewer sources 1.20.7
Diffstat (limited to 'linden/indra/llrender/llrendertarget.cpp')
-rw-r--r-- | linden/indra/llrender/llrendertarget.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/linden/indra/llrender/llrendertarget.cpp b/linden/indra/llrender/llrendertarget.cpp index e1f7703..708c582 100644 --- a/linden/indra/llrender/llrendertarget.cpp +++ b/linden/indra/llrender/llrendertarget.cpp | |||
@@ -32,17 +32,23 @@ | |||
32 | #include "linden_common.h" | 32 | #include "linden_common.h" |
33 | 33 | ||
34 | #include "llrendertarget.h" | 34 | #include "llrendertarget.h" |
35 | #include "llglimmediate.h" | 35 | #include "llrender.h" |
36 | #include "llgl.h" | 36 | #include "llgl.h" |
37 | 37 | ||
38 | 38 | ||
39 | BOOL LLRenderTarget::sUseFBO = FALSE; | 39 | BOOL LLRenderTarget::sUseFBO = FALSE; |
40 | 40 | ||
41 | LLRenderTarget::LLRenderTarget() | 41 | LLRenderTarget::LLRenderTarget() : |
42 | mResX(0), | ||
43 | mResY(0), | ||
44 | mTex(0), | ||
45 | mFBO(0), | ||
46 | mDepth(0), | ||
47 | mStencil(0), | ||
48 | mUseDepth(FALSE), | ||
49 | mRenderDepth(FALSE), | ||
50 | mUsage(GL_TEXTURE_2D) | ||
42 | { | 51 | { |
43 | mResX = mResY = mTex = mFBO = mDepth = 0; | ||
44 | mUseDepth = FALSE; | ||
45 | mUsage = GL_TEXTURE_2D; | ||
46 | } | 52 | } |
47 | 53 | ||
48 | LLRenderTarget::~LLRenderTarget() | 54 | LLRenderTarget::~LLRenderTarget() |
@@ -175,6 +181,7 @@ void LLRenderTarget::clear() | |||
175 | { | 181 | { |
176 | LLGLEnable scissor(GL_SCISSOR_TEST); | 182 | LLGLEnable scissor(GL_SCISSOR_TEST); |
177 | glScissor(0, 0, mResX, mResY); | 183 | glScissor(0, 0, mResX, mResY); |
184 | stop_glerror(); | ||
178 | glClear(mask); | 185 | glClear(mask); |
179 | } | 186 | } |
180 | } | 187 | } |