isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-08 17:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-07-24 Matthew Allum <mallum@openedhand.com>

Browse Source 
* 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)
This commit is contained in:
Matthew Allum 2007-07-24 12:04:24 +00:00
parent 8076d5c218
commit e8c091573c
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-07-24 Matthew Allum <mallum@openedhand.com>
* 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 <mallum@openedhand.com> 2007-07-24 Matthew Allum <mallum@openedhand.com>
* clutter/glx/clutter-stage-glx.c: (clutter_stage_glx_realize): * clutter/glx/clutter-stage-glx.c: (clutter_stage_glx_realize):

10
clutter/clutter-media.c
View File

@ -149,16 +149,6 @@ clutter_media_base_init (gpointer g_iface)
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
/* signals */ /* 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", g_signal_new ("eos",
CLUTTER_TYPE_MEDIA, CLUTTER_TYPE_MEDIA,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,

7
clutter/cogl/gl/cogl.c
View File

@ -210,11 +210,11 @@ cogl_enable (gulong flags)
__enable_flags &= ~CGL_ENABLE_TEXTURE_2D; __enable_flags &= ~CGL_ENABLE_TEXTURE_2D;
} }
#ifdef GL_TEXTURE_RECTANGLE_ARB
if (flags & CGL_ENABLE_TEXTURE_RECT) if (flags & CGL_ENABLE_TEXTURE_RECT)
{ {
if (!(__enable_flags & CGL_ENABLE_TEXTURE_RECT)) if (!(__enable_flags & CGL_ENABLE_TEXTURE_RECT))
glEnable (GL_TEXTURE_RECTANGLE_ARB); glEnable (GL_TEXTURE_RECTANGLE_ARB);
__enable_flags |= CGL_ENABLE_TEXTURE_RECT; __enable_flags |= CGL_ENABLE_TEXTURE_RECT;
} }
else if (__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); glDisable (GL_TEXTURE_RECTANGLE_ARB);
__enable_flags &= ~CGL_ENABLE_TEXTURE_RECT; __enable_flags &= ~CGL_ENABLE_TEXTURE_RECT;
} }
#endif
if (flags & CGL_ENABLE_ALPHA_TEST) if (flags & CGL_ENABLE_ALPHA_TEST)
{ {
@ -278,6 +279,7 @@ cogl_texture_can_size (COGLenum target,
int width, int width,
int height) int height)
{ {
#ifdef GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB
if (target == CGL_TEXTURE_RECTANGLE_ARB) if (target == CGL_TEXTURE_RECTANGLE_ARB)
{ {
gint max_size = 0; gint max_size = 0;
@ -287,6 +289,7 @@ cogl_texture_can_size (COGLenum target,
return (max_size && width <= max_size && height <= max_size); return (max_size && width <= max_size && height <= max_size);
} }
else /* Assumes CGL_TEXTURE_2D */ else /* Assumes CGL_TEXTURE_2D */
#endif
{ {
GLint new_width = 0; GLint new_width = 0;
@ -549,11 +552,13 @@ cogl_get_features ()
gl_extensions = (const gchar*) glGetString (GL_EXTENSIONS); 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) || if (cogl_check_extension ("GL_ARB_texture_rectangle", gl_extensions) ||
cogl_check_extension ("GL_EXT_texture_rectangle", gl_extensions)) cogl_check_extension ("GL_EXT_texture_rectangle", gl_extensions))
{ {
flags |= CLUTTER_FEATURE_TEXTURE_RECTANGLE; flags |= CLUTTER_FEATURE_TEXTURE_RECTANGLE;
} }
#endif
#ifdef GL_YCBCR_MESA #ifdef GL_YCBCR_MESA
if (cogl_check_extension ("GL_MESA_ycbcr_texture", gl_extensions)) if (cogl_check_extension ("GL_MESA_ycbcr_texture", gl_extensions))