zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-23 11:51:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move gl_pipeline_depth usage to framebuffer code so it does not rely on being set externally

Browse source
This commit is contained in:
Emile Belanger 2021-03-13 15:07:13 +00:00
parent c1443b3e9a
commit a65db6b79c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/platform/win32/win32glvideo.cpp
View file

@ -64,7 +64,6 @@ PROC zd_wglGetProcAddress(LPCSTR name);
EXTERN_CVAR(Int, vid_adapter) EXTERN_CVAR(Int, vid_adapter)
EXTERN_CVAR(Bool, vid_hdr) EXTERN_CVAR(Bool, vid_hdr)
EXTERN_CVAR(Int, gl_pipeline_depth);
CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{ {
@ -110,8 +109,6 @@ DFrameBuffer *Win32GLVideo::CreateFrameBuffer()
fb = new OpenGLESRenderer::OpenGLFrameBuffer(m_hMonitor, vid_fullscreen); fb = new OpenGLESRenderer::OpenGLFrameBuffer(m_hMonitor, vid_fullscreen);
//fb = new OpenGLRenderer::OpenGLFrameBuffer(m_hMonitor, vid_fullscreen); //fb = new OpenGLRenderer::OpenGLFrameBuffer(m_hMonitor, vid_fullscreen);
fb->mPipelineNbr = gl_pipeline_depth;
//fb->mPipelineNbr = 1;
return fb; return fb;
} }

3
src/common/rendering/gles/gles_framebuffer.cpp
View file

@ -64,6 +64,7 @@ EXTERN_CVAR(Bool, r_drawvoxels)
EXTERN_CVAR(Int, gl_tonemap) EXTERN_CVAR(Int, gl_tonemap)
EXTERN_CVAR(Bool, cl_capfps) EXTERN_CVAR(Bool, cl_capfps)
EXTERN_CVAR(Bool, gl_customshader) EXTERN_CVAR(Bool, gl_customshader)
EXTERN_CVAR(Int, gl_pipeline_depth);
void Draw2D(F2DDrawer *drawer, FRenderState &state); void Draw2D(F2DDrawer *drawer, FRenderState &state);
@ -122,6 +123,8 @@ void OpenGLFrameBuffer::InitializeState()
gl_customshader = false; gl_customshader = false;
mPipelineNbr = gl_pipeline_depth;
InitGLES(); InitGLES();
// Move some state to the framebuffer object for easier access. // Move some state to the framebuffer object for easier access.