diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 40363c470..432e0483a 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -706,7 +706,15 @@ static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAF static GLRGBAFloat shader_defaultcolor = {1.0f, 1.0f, 1.0f, 1.0f}; #ifdef USE_FBO_OGL -static boolean GLFramebuffer_IsFuncAvailible(void); +static boolean GLFramebuffer_CheckExt(void) +{ + //this stuff needs atleast OGL 3.0 + if (majorGL < 3) + return false; + + // check if all needed gl extensions are available + return (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) && GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) && GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions)); +} #endif void SetupGLFunc4(void) @@ -753,7 +761,7 @@ void SetupGLFunc4(void) pglGetUniformLocation = GetGLFunc("glGetUniformLocation"); #ifdef USE_FBO_OGL - if (GLFramebuffer_IsFuncAvailible()) + if (GLFramebuffer_CheckExt()) { pglGenFramebuffers = GetGLFunc("glGenFramebuffers"); pglBindFramebuffer = GetGLFunc("glBindFramebuffer"); @@ -766,6 +774,12 @@ void SetupGLFunc4(void) pglRenderbufferStorage = GetGLFunc("glRenderbufferStorage"); pglFramebufferRenderbuffer = GetGLFunc("glFramebufferRenderbuffer"); + // check if ALL functions are availible + if (pglGenFramebuffers && pglBindFramebuffer && + pglDeleteFramebuffers && pglFramebufferTexture2D && + pglCheckFramebufferStatus && pglGenRenderbuffers && + pglBindRenderbuffer && pglDeleteRenderbuffers && + pglRenderbufferStorage && pglFramebufferRenderbuffer) supportFBO = true; } #endif diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 672e6a819..73a1f992d 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -781,8 +781,11 @@ void I_DownSample(void) } else { - downsample = false; // its not so no need to do crap - RefreshOGLSDLSurface(); + if (downsample == true) + { + downsample = false; // its not so no need to do crap + RefreshOGLSDLSurface(); + } } } diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c index 7be64d8a8..97a287874 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -210,7 +210,7 @@ boolean OglSdlSurface(INT32 w, INT32 h) if (RenderToFramebuffer) GLFramebuffer_Enable(); - else + else if (!first_init) GLFramebuffer_Disable(); #endif