diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-04 16:19:18 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-04 16:19:18 -0400 |
commit | 542975b4c674c6e13d80f0ec4c18931e769f33b4 (patch) | |
tree | 6274ce57b4c0f0750daf3d4538a0dca9de650981 /indra/newview/pipeline.h | |
parent | 635a264e6f76f33a05694c069635653cd19de5d9 (diff) | |
parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) |
merge
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 9c78048c46..b8b4f164fe 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -111,10 +111,13 @@ public: void destroyGL(); void restoreGL(); void resetVertexBuffers(); + void doResetVertexBuffers(); void resizeScreenTexture(); void releaseGLBuffers(); + void releaseLUTBuffers(); void releaseScreenBuffers(); void createGLBuffers(); + void createLUTBuffers(); void allocateScreenBuffer(U32 resX, U32 resY); bool allocateScreenBuffer(U32 resX, U32 resY, U32 samples); @@ -653,6 +656,8 @@ protected: bool mGroupQ2Locked; bool mGroupQ1Locked; + bool mResetVertexBuffers; //if true, clear vertex buffers on next update + LLViewerObject::vobj_list_t mCreateQ; LLDrawable::drawable_set_t mRetexturedList; |