OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved some buffer variables out of GLRenderer into common parts of the code so that they can be accessed from hwrenderer as well.

Browse source 
This will allow more code to be moved out of the API dependent parts.
This commit is contained in:
Christoph Oelckers 2018-10-28 13:56:24 +01:00
commit f7c7c8d1c5
12 changed files with 66 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/gl/renderer/gl_renderer.cpp
View file

@ -102,15 +102,10 @@ void FGLRenderer::Initialize(int width, int height)
glBindVertexArray(mVAOID);
FGLDebug::LabelObject(GL_VERTEX_ARRAY, mVAOID, "FGLRenderer.mVAOID");
mVBO = new FFlatVertexBuffer(width, height);
mSkyVBO = new FSkyVertexBuffer;
mLights = new FLightBuffer();
mViewpoints = new GLViewpointBuffer;
GLRenderer->mVBO->Bind(gl_RenderState);
mFBID = 0;
mOldFBID = 0;
SetupLevel();
mShaderManager = new FShaderManager;
mSamplerManager = new FSamplerManager;
}
@ -122,10 +117,7 @@ FGLRenderer::~FGLRenderer()
FMaterial::FlushAll();
if (mShaderManager != nullptr) delete mShaderManager;
if (mSamplerManager != nullptr) delete mSamplerManager;
if (mVBO != nullptr) delete mVBO;
if (mSkyVBO != nullptr) delete mSkyVBO;
if (mLights != nullptr) delete mLights;
if (mViewpoints != nullptr) delete mViewpoints;
if (mFBID != 0) glDeleteFramebuffers(1, &mFBID);
if (mVAOID != 0)
{
@ -160,7 +152,7 @@ void FGLRenderer::ResetSWScene()
void FGLRenderer::SetupLevel()
{
mVBO->CreateVBO();
screen->mVertexData->CreateVBO();
}
//===========================================================================
@ -200,8 +192,8 @@ void FGLRenderer::EndOffscreen()
sector_t *FGLRenderer::RenderView(player_t* player)
{
GLRenderer->mVBO->Bind(gl_RenderState);
mVBO->Reset();
screen->mVertexData->Bind(gl_RenderState);
screen->mVertexData->Reset();
sector_t *retsec;
if (!V_IsHardwareRenderer())
@ -223,7 +215,7 @@ sector_t *FGLRenderer::RenderView(player_t* player)
P_FindParticleSubsectors();
mLights->Clear();
mViewpoints->Clear();
screen->mViewpoints->Clear();
// NoInterpolateView should have no bearing on camera textures, but needs to be preserved for the main view below.
bool saved_niv = NoInterpolateView;
@ -315,17 +307,17 @@ void FGLRenderer::WriteSavePic (player_t *player, FileWriter *file, int width, i
bounds.width = width;
bounds.height = height;
// if mVBO is persistently mapped we must be sure the GPU finished reading from it before we fill it with new data.
// we must be sure the GPU finished reading from the buffer before we fill it with new data.
glFinish();
// Switch to render buffers dimensioned for the savepic
mBuffers = mSaveBuffers;
P_FindParticleSubsectors(); // make sure that all recently spawned particles have a valid subsector.
GLRenderer->mVBO->Bind(gl_RenderState);
mVBO->Reset();
screen->mVertexData->Bind(gl_RenderState);
screen->mVertexData->Reset();
mLights->Clear();
mViewpoints->Clear();
screen->mViewpoints->Clear();
// This shouldn't overwrite the global viewpoint even for a short time.
FRenderViewpoint savevp;
@ -422,7 +414,7 @@ void FGLRenderer::Draw2D(F2DDrawer *drawer)
FDrawInfo di; // For access to the virtual interface. This should be placed elsewhere...
const auto &mScreenViewport = screen->mScreenViewport;
glViewport(mScreenViewport.left, mScreenViewport.top, mScreenViewport.width, mScreenViewport.height);
GLRenderer->mViewpoints->Set2D(&di, screen->GetWidth(), screen->GetHeight());
screen->mViewpoints->Set2D(&di, screen->GetWidth(), screen->GetHeight());
glDisable(GL_DEPTH_TEST);
@ -543,7 +535,7 @@ void FGLRenderer::Draw2D(F2DDrawer *drawer)
glDisable(GL_SCISSOR_TEST);
gl_RenderState.SetRenderStyle(STYLE_Translucent);
GLRenderer->mVBO->Bind(gl_RenderState);
screen->mVertexData->Bind(gl_RenderState);
gl_RenderState.EnableTexture(true);
gl_RenderState.EnableBrightmap(true);
gl_RenderState.SetTextureMode(TM_NORMAL);