From 3d034ff6aa9b0494c4d95593f84647bee1445224 Mon Sep 17 00:00:00 2001 From: Tommi Komulainen Date: Thu, 5 Jun 2008 21:40:59 +0000 Subject: [PATCH] cogl: define GL_READ/DRAW_FRAMEBUFFER_EXT if not available Bug 913 - cogl fails to build on OSX * clutter/cogl/gl/cogl-fbo.c: define GL_READ_FRAMEBUFFER_EXT and GL_DRAW_FRAMEBUFFER_EXT if not defined in the build system. The #ifdef can fail if they're not #defines but variables or enums. As the values are supposed to be industry standard even then it shouldn't have ill effects. --- ChangeLog | 10 ++++++++++ clutter/cogl/gl/cogl-fbo.c | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 78def1967..cc59d90a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-06-05 Tommi Komulainen + + Bug 913 - cogl fails to build on OSX + + * clutter/cogl/gl/cogl-fbo.c: define GL_READ_FRAMEBUFFER_EXT and + GL_DRAW_FRAMEBUFFER_EXT if not defined in the build system. The + #ifdef can fail if they're not #defines but variables or enums. + As the values are supposed to be industry standard even then + it shouldn't have ill effects. + 2008-06-05 Tommi Komulainen Bug #911 - OSX: add multistage support diff --git a/clutter/cogl/gl/cogl-fbo.c b/clutter/cogl/gl/cogl-fbo.c index d920dd96b..ae598461d 100644 --- a/clutter/cogl/gl/cogl-fbo.c +++ b/clutter/cogl/gl/cogl-fbo.c @@ -48,6 +48,13 @@ #define glBlitFramebufferEXT ctx->pf_glBlitFramebufferEXT #define glRenderbufferStorageMultisampleEXT ctx->pf_glRenderbufferStorageMultisampleEXT +#ifndef GL_READ_FRAMEBUFFER_EXT +#define GL_READ_FRAMEBUFFER_EXT 0x8CA8 +#endif +#ifndef GL_DRAW_FRAMEBUFFER_EXT +#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 +#endif + static void _cogl_offscreen_free (CoglFbo *fbo); COGL_HANDLE_DEFINE (Fbo, offscreen, fbo_handles);