From eca37ef3ec1b9ce2117a7dae9d81c26ff633b037 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 15 Dec 2009 20:27:57 +0000 Subject: [PATCH] - fixed: The GL renderer didn't advertise its hardware rendering capabilities for some checks. - fixed: The closed subsector check was outside the loop it was supposed to be in. git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@660 b0f79afe-0144-0410-b225-9a4edf0717df --- src/gl/data/gl_nodes.cpp | 17 ++++++++++------- src/gl/system/gl_framebuffer.cpp | 1 + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/gl/data/gl_nodes.cpp b/src/gl/data/gl_nodes.cpp index c93ec771..944b62f7 100644 --- a/src/gl/data/gl_nodes.cpp +++ b/src/gl/data/gl_nodes.cpp @@ -495,15 +495,18 @@ bool gl_LoadGLSubsectors(FileReader * f, wadlump_t * lump) seg_t * seg = &segs[subsectors[i].firstline+j]; if (seg->linedef==NULL) seg->frontsector = seg->backsector = segs[subsectors[i].firstline].frontsector; } + seg_t *firstseg = &segs[subsectors[i].firstline]; + seg_t *lastseg = &segs[subsectors[i].firstline + subsectors[i].numlines - 1]; + // The subsector must be closed. If it isn't we can't use these nodes and have to do a rebuild. + if (lastseg->v2 != firstseg->v1) + { + delete [] datab; + return false; + } + } - - seg_t *firstseg = &segs[subsectors[i].firstline]; - seg_t *lastseg = &segs[subsectors[i].firstline + subsectors[i].numlines - 1]; - delete [] datab; - - // The subsector must be closed. If it isn't we can't use these nodes and have to do a rebuild. - return (lastseg->v2 == firstseg->v1); + return true; } //========================================================================== diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp index c43f026e..7ba388b9 100644 --- a/src/gl/system/gl_framebuffer.cpp +++ b/src/gl/system/gl_framebuffer.cpp @@ -91,6 +91,7 @@ OpenGLFrameBuffer::OpenGLFrameBuffer(int width, int height, int bits, int refres DoSetGamma(); needsetgamma = true; swapped = false; + Accel2D = true; if (gl.SetVSync!=NULL) gl.SetVSync(vid_vsync); }