From e8c091573c7a77b719d9735746942804b507a51a Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Tue, 24 Jul 2007 12:04:24 +0000 Subject: [PATCH] 2007-07-24 Matthew Allum * clutter/clutter-media.c: (clutter_media_base_init): Remove #if 0! signal - assume causing issues with binding generation. (#407) * clutter/cogl/gl/cogl.c: Check GL_TEXTURE_RECTANGLE_ARB and GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB are defined in gl.h (#404) --- ChangeLog | 10 ++++++++++ clutter/clutter-media.c | 10 ---------- clutter/cogl/gl/cogl.c | 7 ++++++- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index e715e2a43..c86616aa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-07-24 Matthew Allum + + * clutter/clutter-media.c: (clutter_media_base_init): + Remove #if 0! signal - assume causing issues with binding generation. + (#407) + + * clutter/cogl/gl/cogl.c: + Check GL_TEXTURE_RECTANGLE_ARB and GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB + are defined in gl.h (#404) + 2007-07-24 Matthew Allum * clutter/glx/clutter-stage-glx.c: (clutter_stage_glx_realize): diff --git a/clutter/clutter-media.c b/clutter/clutter-media.c index 55b12281a..1c653f9d2 100644 --- a/clutter/clutter-media.c +++ b/clutter/clutter-media.c @@ -149,16 +149,6 @@ clutter_media_base_init (gpointer g_iface) G_PARAM_STATIC_BLURB)); /* signals */ -#if 0 - g_signal_new ("metadata-available", - CLUTTER_TYPE_MEDIA, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ClutterMediaInterface, - metadata_available), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); -#endif g_signal_new ("eos", CLUTTER_TYPE_MEDIA, G_SIGNAL_RUN_LAST, diff --git a/clutter/cogl/gl/cogl.c b/clutter/cogl/gl/cogl.c index 7800dc07e..93428a1ca 100644 --- a/clutter/cogl/gl/cogl.c +++ b/clutter/cogl/gl/cogl.c @@ -210,11 +210,11 @@ cogl_enable (gulong flags) __enable_flags &= ~CGL_ENABLE_TEXTURE_2D; } +#ifdef GL_TEXTURE_RECTANGLE_ARB if (flags & CGL_ENABLE_TEXTURE_RECT) { if (!(__enable_flags & CGL_ENABLE_TEXTURE_RECT)) glEnable (GL_TEXTURE_RECTANGLE_ARB); - __enable_flags |= CGL_ENABLE_TEXTURE_RECT; } else if (__enable_flags & CGL_ENABLE_TEXTURE_RECT) @@ -222,6 +222,7 @@ cogl_enable (gulong flags) glDisable (GL_TEXTURE_RECTANGLE_ARB); __enable_flags &= ~CGL_ENABLE_TEXTURE_RECT; } +#endif if (flags & CGL_ENABLE_ALPHA_TEST) { @@ -278,6 +279,7 @@ cogl_texture_can_size (COGLenum target, int width, int height) { +#ifdef GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB if (target == CGL_TEXTURE_RECTANGLE_ARB) { gint max_size = 0; @@ -287,6 +289,7 @@ cogl_texture_can_size (COGLenum target, return (max_size && width <= max_size && height <= max_size); } else /* Assumes CGL_TEXTURE_2D */ +#endif { GLint new_width = 0; @@ -549,11 +552,13 @@ cogl_get_features () gl_extensions = (const gchar*) glGetString (GL_EXTENSIONS); +#ifdef GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB and GL_TEXTURE_RECTANGLE_ARB if (cogl_check_extension ("GL_ARB_texture_rectangle", gl_extensions) || cogl_check_extension ("GL_EXT_texture_rectangle", gl_extensions)) { flags |= CLUTTER_FEATURE_TEXTURE_RECTANGLE; } +#endif #ifdef GL_YCBCR_MESA if (cogl_check_extension ("GL_MESA_ycbcr_texture", gl_extensions))