diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-04 02:31:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-04 02:31:54 -0500 |
| commit | c4aa8c50daf7c4eea3509057a7ca74b083682779 (patch) | |
| tree | 0c2465843f2c01494d78ce135574934a609ead73 /indra/llrender/llrendertarget.h | |
| parent | ac37656aa5ff545c90fadfd5b585cb823ad68b0d (diff) | |
SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session
Diffstat (limited to 'indra/llrender/llrendertarget.h')
| -rw-r--r-- | indra/llrender/llrendertarget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h index dea1de12d8..2735ab21c5 100644 --- a/indra/llrender/llrendertarget.h +++ b/indra/llrender/llrendertarget.h @@ -64,6 +64,7 @@ class LLRenderTarget public: //whether or not to use FBO implementation static bool sUseFBO; + static U32 sBytesAllocated; LLRenderTarget(); ~LLRenderTarget(); @@ -147,7 +148,6 @@ protected: bool mUseDepth; bool mRenderDepth; LLTexUnit::eTextureType mUsage; - U32 mSamples; static LLRenderTarget* sBoundTarget; }; |