diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-01-25 15:37:36 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-01-25 15:37:36 -0600 |
| commit | 0bbe8d73cb687e34d1b10c58b67c465df076739c (patch) | |
| tree | 9eb9a7fb850d02d43161ba00bffb096f529a407c /indra/newview/pipeline.h | |
| parent | 9e621af3db9fbb0728bf7b338ea4e17c56ab25bb (diff) | |
SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer.
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 9c78048c46..3c4e389ce0 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -111,6 +111,7 @@ public: void destroyGL(); void restoreGL(); void resetVertexBuffers(); + void doResetVertexBuffers(); void resizeScreenTexture(); void releaseGLBuffers(); void releaseScreenBuffers(); @@ -653,6 +654,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; |