From 6ad0a74c75bd4c906a23730d78528dd577f7797e Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 8 Dec 2022 22:24:05 -0500
Subject: [PATCH] More cracks are forming...
---
indra/llrender/llrender.h | 3 ---
indra/newview/llviewerwindow.cpp | 2 +-
indra/newview/pipeline.cpp | 3 ---
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 6186a46b005..2c5dd81ee68 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 1ec9444f54f..06b1eb0e927 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 4acb2984279..4063198a478 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())
--
GitLab