Updated gles_renderer.cpp.

Removed VAO
This commit is contained in:
Emile Belanger 2021-02-20 15:52:09 +00:00
parent 266095825a
commit 6fadd36475
2 changed files with 4 additions and 20 deletions

View file

@ -42,13 +42,12 @@
#include "version.h"
#include "gles_framebuffer.h"
#include "hw_cvars.h"
#include "gles_debug.h"
#include "gles_renderer.h"
#include "gles_hwtexture.h"
#include "gles_renderstate.h"
#include "gles_renderbuffers.h"
#include "gles_shaderprogram.h"
#include "flatvertices.h"
#include "gles_samplers.h"
#include "hw_lightbuffer.h"
#include "r_videoscale.h"
#include "model.h"
@ -89,16 +88,10 @@ void FGLRenderer::Initialize(int width, int height)
mPresent3dRowShader = new FPresent3DRowShader();
mShadowMapShader = new FShadowMapShader();
// needed for the core profile, because someone decided it was a good idea to remove the default VAO.
glGenVertexArrays(1, &mVAOID);
glBindVertexArray(mVAOID);
FGLDebug::LabelObject(GL_VERTEX_ARRAY, mVAOID, "FGLRenderer.mVAOID");
mFBID = 0;
mOldFBID = 0;
mShaderManager = new FShaderManager;
mSamplerManager = new FSamplerManager;
}
FGLRenderer::~FGLRenderer()
@ -106,13 +99,8 @@ FGLRenderer::~FGLRenderer()
FlushModels();
TexMan.FlushAll();
if (mShaderManager != nullptr) delete mShaderManager;
if (mSamplerManager != nullptr) delete mSamplerManager;
if (mFBID != 0) glDeleteFramebuffers(1, &mFBID);
if (mVAOID != 0)
{
glBindVertexArray(0);
glDeleteVertexArrays(1, &mVAOID);
}
if (mBuffers) delete mBuffers;
if (mSaveBuffers) delete mSaveBuffers;
if (mPresentShader) delete mPresentShader;
@ -135,8 +123,6 @@ bool FGLRenderer::StartOffscreen()
glGenFramebuffers(1, &mFBID);
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &mOldFBID);
glBindFramebuffer(GL_FRAMEBUFFER, mFBID);
if (firstBind)
FGLDebug::LabelObject(GL_FRAMEBUFFER, mFBID, "OffscreenFB");
return true;
}

View file

@ -45,12 +45,10 @@ public:
int mMirrorCount = 0;
int mPlaneMirrorCount = 0;
FShaderManager *mShaderManager = nullptr;
FSamplerManager *mSamplerManager = nullptr;
unsigned int mFBID;
unsigned int mVAOID;
unsigned int mFBID = 0;
unsigned int mStencilValue = 0;
int mOldFBID;
int mOldFBID = 0;
FGLRenderBuffers *mBuffers = nullptr;
FGLRenderBuffers *mScreenBuffers = nullptr;