diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 6186a46b005c537001549e90ccd9636cd431e921..2c5dd81ee685c0593b18555afc2ee58dbcd30691 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -365,9 +365,6 @@ class LLRender // Needed when the render context has changed and invalidated the current state void refreshState(void); - void resetVertexBuffers(); - void restoreVertexBuffers(); - void translatef(const GLfloat& x, const GLfloat& y, const GLfloat& z); void scalef(const GLfloat& x, const GLfloat& y, const GLfloat& z); //rotatef requires generation of a transform matrix involving sine/cosine. If rotating by a constant value, use genRot, store the result in a static variable, and pass that var to rotatef. diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 1ec9444f54fa4ac455ad70cc43fe7600ee9ff8a0..06b1eb0e927fcc8d28262b6a1bb474f50c4b98b5 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -5827,7 +5827,7 @@ void LLViewerWindow::stopGL(BOOL save_state) shader->unload(); } - gGL.resetVertexBuffers(); + gGL.resetVertexBuffer(); LLVertexBuffer::cleanupClass(); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 4acb2984279d60301870e61565ade4f541d5cede..4063198a478e04550c600be27580dfe0b6ead67c 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7415,7 +7415,6 @@ void LLPipeline::doResetVertexBuffers(bool forced) LLVOPartGroup::destroyGL(); gGL.resetVertexBuffer(); - gGL.resetVertexBuffers(); SUBSYSTEM_CLEANUP(LLVertexBuffer); if (LLVertexBuffer::sGLCount != 0) @@ -7444,8 +7443,6 @@ void LLPipeline::doResetVertexBuffers(bool forced) mDeferredVB = new LLVertexBuffer(DEFERRED_VB_MASK, 0); mDeferredVB->allocateBuffer(8, 0, true); - gGL.restoreVertexBuffers(); - LLVOPartGroup::restoreGL(); if (mCubeVB.isNull())