zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-31 13:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed potentially broken portal rendering after OpenGL context change

Browse source 
https://forum.zdoom.org/viewtopic.php?t=56393
This commit is contained in:
alexey.lysiuk 2017-05-30 13:01:51 +03:00
parent 7e7e1ff12e
commit 0c90253a5d
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,7 @@
#include "gl/data/gl_data.h"
#include "gl/data/gl_vertexbuffer.h"
#include "gl/scene/gl_drawinfo.h"
#include "gl/scene/gl_portal.h"
#include "gl/shaders/gl_shader.h"
#include "gl/shaders/gl_ambientshader.h"
#include "gl/shaders/gl_bloomshader.h"
@ -184,10 +185,14 @@ void FGLRenderer::Initialize(int width, int height)
mShaderManager = new FShaderManager;
mSamplerManager = new FSamplerManager;
gl_LoadModels();
GLPortal::Initialize();
}
FGLRenderer::~FGLRenderer()
{
GLPortal::Shutdown();
gl_FlushModels();
AActor::DeleteAllAttachedLights();
FMaterial::FlushAll();

16
src/gl/scene/gl_portal.cpp
View file

@ -205,7 +205,6 @@ bool GLPortal::Start(bool usestencil, bool doquery)
else if (gl_noquery) doquery = false;
// If occlusion query is supported let's use it to avoid rendering portals that aren't visible
if (!QueryObject && doquery) glGenQueries(1, &QueryObject);
if (QueryObject)
{
glBeginQuery(GL_SAMPLES_PASSED, QueryObject);
@ -1264,6 +1263,21 @@ void GLEEHorizonPortal::DrawContents()
}
void GLPortal::Initialize()
{
assert(0 == QueryObject);
glGenQueries(1, &QueryObject);
}
void GLPortal::Shutdown()
{
if (0 != QueryObject)
{
glDeleteQueries(1, &QueryObject);
QueryObject = 0;
}
}
const char *GLSkyPortal::GetName() { return "Sky"; }
const char *GLSkyboxPortal::GetName() { return "Skybox"; }
const char *GLSectorStackPortal::GetName() { return "Sectorstack"; }

3
src/gl/scene/gl_portal.h
View file

@ -177,6 +177,9 @@ public:
static bool RenderFirstSkyPortal(int recursion);
static void EndFrame();
static GLPortal * FindPortal(const void * src);
static void Initialize();
static void Shutdown();
};
struct GLLinePortal : public GLPortal