diff --git a/ChangeLog b/ChangeLog index 49a2fce8f..185018fd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,32 +1,39 @@ +2008-05-30 Emmanuele Bassi + + * clutter/pango/pangoclutter-fontmap.c: + * clutter/pango/pangoclutter-renderer.c: + * clutter/pango/pangoclutter.h + * clutter/pango/pangoclutter-private.h: Add a function retrieving + the font mipmapping setting. + 2008-05-29 Neil Roberts - * clutter/cogl/gles/cogl-gles2-wrapper.h (CoglGles2Wrapper): Added - uniforms for alpha testing. - - * clutter/cogl/gles/cogl-gles2-wrapper.c - (cogl_gles2_wrapper_init): Get the uniforms for alpha testing - settings. - (cogl_wrap_glEnable, cogl_wrap_glDisable): Enable/disable alpha - testing. - (cogl_wrap_glAlphaFunc): Filled in the wrapper. - - * clutter/cogl/gles/cogl-fixed-fragment-shader.glsl: Added alpha - testing. + * clutter/cogl/gles/cogl-gles2-wrapper.h (CoglGles2Wrapper): Added + uniforms for alpha testing. - * clutter/cogl/gles/cogl-gles2-wrapper.h: - * clutter/cogl/gles/cogl-gles2-wrapper.c - (cogl_wrap_glGetIntegerv): Added a wrapper for glGetIntegerv so - that it can report zero clip planes. - - * clutter/cogl/gles/cogl.c: - * clutter/cogl/gles/cogl-texture.c: Use the wrapped version of - glGetIntegerv + * clutter/cogl/gles/cogl-gles2-wrapper.c + (cogl_gles2_wrapper_init): Get the uniforms for alpha testing + settings. + (cogl_wrap_glEnable, cogl_wrap_glDisable): Enable/disable alpha + testing. + (cogl_wrap_glAlphaFunc): Filled in the wrapper. - * clutter/cogl/gles/cogl-primitives.c (_cogl_path_fill_nodes): Use - _cogl_features_available to check for the stencil buffer instead - of an #ifdef. The stencil buffer is available in the default - profile for the GLES 2 simulator. + * clutter/cogl/gles/cogl-fixed-fragment-shader.glsl: Added alpha + testing. + * clutter/cogl/gles/cogl-gles2-wrapper.h: + * clutter/cogl/gles/cogl-gles2-wrapper.c + (cogl_wrap_glGetIntegerv): Added a wrapper for glGetIntegerv so + that it can report zero clip planes. + + * clutter/cogl/gles/cogl.c: + * clutter/cogl/gles/cogl-texture.c: Use the wrapped version of + glGetIntegerv + + * clutter/cogl/gles/cogl-primitives.c (_cogl_path_fill_nodes): Use + _cogl_features_available to check for the stencil buffer instead + of an #ifdef. The stencil buffer is available in the default + profile for the GLES 2 simulator. 2008-05-29 Emmanuele Bassi @@ -117,7 +124,7 @@ 2008-05-28 Emmanuele Bassi Bug 882 - Allow child properties for containers implementing the - ClutterContainer interface (Øyvind Kolås) + ClutterContainer interface (Øyvind Kolås) * clutter/clutter-child-meta.[ch]: Base class for the metadata of a ClutterActor inside a ClutterContainer; the ChildMeta @@ -251,7 +258,7 @@ 2008-05-26 Matthew Allum * clutter/x11/clutter-stage-x11.c: (clutter_stage_x11_request_coords): - Dont allow the window to be resize to 0 dimentions. (fixes #933) + Dont allow the window to be resize to 0 dimentions. (fixes #933) 2008-05-23 Emmanuele Bassi @@ -380,16 +387,16 @@ 2008-05-16 Neil Roberts - Use the Mesa headers instead of depending on GLee for Win32 + Use the Mesa headers instead of depending on GLee for Win32 builds. - * configure.ac: No longer check for GLee + * configure.ac: No longer check for GLee - * clutter/cogl/gl/cogl-defines.h.in: Don't bother including GLee.h + * clutter/cogl/gl/cogl-defines.h.in: Don't bother including GLee.h - * build/mingw/mingw-cross-compile.sh: No longer downloads libGLee - but downloads the Mesa library instead and installs the headers - from that. Fixed the libpng version. + * build/mingw/mingw-cross-compile.sh: No longer downloads libGLee + but downloads the Mesa library instead and installs the headers + from that. Fixed the libpng version. 2008-05-16 Tomas Frydrych @@ -563,8 +570,8 @@ * clutter/x11/clutter-x11-texture-pixmap.c: * configure.ac: * tests/Makefile.am: - Remove the XComposite dep from Clutter itself, just use - in test-pixmap (if available) + Remove the XComposite dep from Clutter itself, just use + in test-pixmap (if available) 2008-05-12 Emmanuele Bassi @@ -780,7 +787,7 @@ * clutter/glx/clutter-glx-texture-pixmap.c: * clutter/x11/clutter-x11-texture-pixmap.c: - More cleanups, safety additions. + More cleanups, safety additions. 2008-05-05 Øyvind Kolås diff --git a/clutter/pango/pangoclutter-fontmap.c b/clutter/pango/pangoclutter-fontmap.c index 72366fe42..409815cca 100644 --- a/clutter/pango/pangoclutter-fontmap.c +++ b/clutter/pango/pangoclutter-fontmap.c @@ -112,6 +112,16 @@ pango_clutter_font_map_set_use_mipmapping (PangoClutterFontMap *fm, _pango_clutter_renderer_set_use_mipmapping (renderer, value); } +gboolean +pango_clutter_font_map_get_use_mipmapping (PangoClutterFontMap *fm) +{ + PangoClutterRenderer *renderer; + + renderer = PANGO_CLUTTER_RENDERER (_pango_clutter_font_map_get_renderer (fm)); + + return _pango_clutter_renderer_get_use_mipmapping (renderer); +} + static GQuark pango_clutter_font_map_get_renderer_key (void) { diff --git a/clutter/pango/pangoclutter-private.h b/clutter/pango/pangoclutter-private.h index 549b23f69..969b0e844 100644 --- a/clutter/pango/pangoclutter-private.h +++ b/clutter/pango/pangoclutter-private.h @@ -30,12 +30,13 @@ G_BEGIN_DECLS -PangoRenderer *_pango_clutter_font_map_get_renderer (PangoClutterFontMap *fm); +PangoRenderer *_pango_clutter_font_map_get_renderer (PangoClutterFontMap *fm); -void _pango_clutter_renderer_clear_glyph_cache (PangoClutterRenderer *renderer); +void _pango_clutter_renderer_clear_glyph_cache (PangoClutterRenderer *renderer); -void _pango_clutter_renderer_set_use_mipmapping (PangoClutterRenderer *renderer, - gboolean value); +void _pango_clutter_renderer_set_use_mipmapping (PangoClutterRenderer *renderer, + gboolean value); +gboolean _pango_clutter_renderer_get_use_mipmapping (PangoClutterRenderer *renderer); G_END_DECLS diff --git a/clutter/pango/pangoclutter-render.c b/clutter/pango/pangoclutter-render.c index f54b095b8..575b9553f 100644 --- a/clutter/pango/pangoclutter-render.c +++ b/clutter/pango/pangoclutter-render.c @@ -199,6 +199,12 @@ _pango_clutter_renderer_set_use_mipmapping (PangoClutterRenderer *renderer, renderer->use_mipmapping = value; } +gboolean +_pango_clutter_renderer_get_use_mipmapping (PangoClutterRenderer *renderer) +{ + return renderer->use_mipmapping; +} + static PangoClutterGlyphCacheValue * pango_clutter_renderer_get_cached_glyph (PangoRenderer *renderer, PangoFont *font, diff --git a/clutter/pango/pangoclutter.h b/clutter/pango/pangoclutter.h index 304f5be03..1961b5ba8 100644 --- a/clutter/pango/pangoclutter.h +++ b/clutter/pango/pangoclutter.h @@ -56,8 +56,9 @@ void pango_clutter_font_map_set_resolution (PangoClutterFontMap *font_map, void pango_clutter_font_map_clear_glyph_cache (PangoClutterFontMap *fm); -void pango_clutter_font_map_set_use_mipmapping (PangoClutterFontMap *fm, - gboolean value); +void pango_clutter_font_map_set_use_mipmapping (PangoClutterFontMap *fm, + gboolean value); +gboolean pango_clutter_font_map_get_use_mipmapping (PangoClutterFontMap *fm); void pango_clutter_ensure_glyph_cache_for_layout (PangoLayout *layout);