tex = (CoglTexture*) g_malloc ( sizeof (CoglTexture));
tex->is_foreign = FALSE;
- tex->auto_mipmap = ((flags & COGL_TEXTURE_AUTO_MIPMAP) != 0);
+ tex->auto_mipmap = (flags & COGL_TEXTURE_NO_AUTO_MIPMAP) == 0;
+ tex->mipmaps_dirty = TRUE;
tex->bitmap = *bmp;
- tex->bitmap_owner = TRUE;
- bmp->data = NULL;
+ tex->bitmap_owner = FALSE;
tex->slice_x_spans = NULL;
tex->slice_y_spans = NULL;
static void
clutter_stage_egl_get_preferred_width (ClutterActor *self,
- ClutterUnit for_height,
- ClutterUnit *min_width_p,
- ClutterUnit *natural_width_p)
- gfloat for_height,
- gfloat *min_width_p,
- gfloat *natural_width_p)
++ gfloat for_height,
++ gfloat *min_width_p,
++ gfloat *natural_width_p)
{
ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (self);
static void
clutter_stage_egl_get_preferred_height (ClutterActor *self,
- ClutterUnit for_width,
- ClutterUnit *min_height_p,
- ClutterUnit *natural_height_p)
- gfloat for_width,
- gfloat *min_height_p,
- gfloat *natural_height_p)
++ gfloat for_width,
++ gfloat *min_height_p,
++ gfloat *natural_height_p)
{
ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (self);
AC_SUBST(JSON_PREFIX)
AM_CONDITIONAL(LOCAL_JSON_GLIB, test "x$have_json" = "xno")
-
-CLUTTER_REQUIRES="cairo >= 1.4 pangocairo >= 1.18 gobject-2.0 >= 2.16 gthread-2.0 gmodule-no-export-2.0 $IMAGE_PC_FILES $BACKEND_PC_FILES $X11_PC_FILES $JSON_GLIB_PC"
+ dnl === Dependencies, compiler flags and linker libraries =====================
+CLUTTER_REQUIRES="cairo >= 1.4 pangocairo >= 1.20 gobject-2.0 >= 2.16 gthread-2.0 gmodule-no-export-2.0 $BACKEND_PC_FILES $JSON_GLIB_PC"
- if test "x$imagebackend" = "xgdk-pixbuf"; then
- CLUTTER_REQUIRES="$CLUTTER_REQUIRES gdk-pixbuf-2.0"
- fi
-
PKG_CHECK_MODULES(CLUTTER_DEPS, [$CLUTTER_REQUIRES])
AC_SUBST(CLUTTER_REQUIRES)