yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kwin: Fix FBO function resolution for core contexts

Browse source
This commit is contained in:
Fredrik Höglund 2013-03-13 16:48:40 +01:00
parent 855a7cc897
commit cb81e11375
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libkwineffects/kwinglutils.cpp
View file

@ -940,8 +940,8 @@ void GLRenderTarget::initStatic()
sSupported = true; sSupported = true;
s_blitSupported = false; s_blitSupported = false;
#else #else
sSupported = hasGLExtension("GL_EXT_framebuffer_object") && glFramebufferTexture2D; sSupported = hasGLVersion(3, 0) || hasGLExtension("GL_ARB_framebuffer_object") || hasGLExtension("GL_EXT_framebuffer_object");
s_blitSupported = hasGLExtension("GL_EXT_framebuffer_blit"); s_blitSupported = hasGLVersion(3, 0) || hasGLExtension("GL_ARB_framebuffer_object") || hasGLExtension("GL_EXT_framebuffer_blit");
#endif #endif
} }

4
libkwineffects/kwinglutils_funcs.cpp
View file

@ -242,7 +242,7 @@ void glResolveFunctions(OpenGLPlatformInterface platformInterface)
glTextureUnitsCount = 0; glTextureUnitsCount = 0;
} }
if (hasGLExtension("GL_ARB_framebuffer_object")) { if (hasGLVersion(3, 0) || hasGLExtension("GL_ARB_framebuffer_object")) {
// see http://www.opengl.org/registry/specs/ARB/framebuffer_object.txt // see http://www.opengl.org/registry/specs/ARB/framebuffer_object.txt
GL_RESOLVE(glIsRenderbuffer); GL_RESOLVE(glIsRenderbuffer);
GL_RESOLVE(glBindRenderbuffer); GL_RESOLVE(glBindRenderbuffer);
@ -316,7 +316,7 @@ void glResolveFunctions(OpenGLPlatformInterface platformInterface)
glGenerateMipmap = NULL; glGenerateMipmap = NULL;
} }
if (hasGLExtension("GL_ARB_framebuffer_object")) { if (hasGLVersion(3, 0) || hasGLExtension("GL_ARB_framebuffer_object")) {
// see http://www.opengl.org/registry/specs/ARB/framebuffer_object.txt // see http://www.opengl.org/registry/specs/ARB/framebuffer_object.txt
GL_RESOLVE(glBlitFramebuffer); GL_RESOLVE(glBlitFramebuffer);
} else if (hasGLExtension("GL_EXT_framebuffer_blit")) { } else if (hasGLExtension("GL_EXT_framebuffer_blit")) {