54d8aadf1d
The texture filters are now a property of the material layer rather than the texture object. Whenever a texture is painted with a material it sets the filters on all of the GL textures in the Cogl texture. The filter is cached so that it won't be changed unnecessarily. The automatic mipmap generation has changed so that the mipmaps are only generated when the texture is painted instead of every time the data changes. Changing the texture sets a flag to mark that the mipmaps are dirty. This works better if the FBO extension is available because we can use glGenerateMipmap. If the extension is not available it will temporarily enable automatic mipmap generation and reupload the first pixel of each slice. This requires tracking the data for the first pixel. The COGL_TEXTURE_AUTO_MIPMAP flag has been replaced with COGL_TEXTURE_NO_AUTO_MIPMAP so that it will default to auto-mipmapping. The mipmap generation is now effectively free if you are not using a mipmap filter mode so you would only want to disable it if you had some special reason to generate your own mipmaps. ClutterTexture no longer has to store its own copy of the filter mode. Instead it stores it in the material and the property is directly set and read from that. This fixes problems with the filters getting out of sync when a cogl handle is set on the texture directly. It also avoids the mess of having to rerealize the texture if the filter quality changes to HIGH because Cogl will take of generating the mipmaps if needed.
79 lines
2.2 KiB
C
79 lines
2.2 KiB
C
/*
|
|
* Clutter.
|
|
*
|
|
* An OpenGL based 'interactive canvas' library.
|
|
*
|
|
* Authored By Matthew Allum <mallum@openedhand.com>
|
|
*
|
|
* Copyright (C) 2008 OpenedHand
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef __COGL_PANGO_GLYPH_CACHE_H__
|
|
#define __COGL_PANGO_GLYPH_CACHE_H__
|
|
|
|
#include <glib.h>
|
|
#include <cogl/cogl.h>
|
|
#include <pango/pango-font.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
typedef struct _CoglPangoGlyphCache CoglPangoGlyphCache;
|
|
typedef struct _CoglPangoGlyphCacheValue CoglPangoGlyphCacheValue;
|
|
|
|
struct _CoglPangoGlyphCacheValue
|
|
{
|
|
CoglHandle texture;
|
|
|
|
float tx1;
|
|
float ty1;
|
|
float tx2;
|
|
float ty2;
|
|
|
|
int draw_x;
|
|
int draw_y;
|
|
int draw_width;
|
|
int draw_height;
|
|
};
|
|
|
|
CoglPangoGlyphCache *
|
|
cogl_pango_glyph_cache_new (void);
|
|
|
|
void
|
|
cogl_pango_glyph_cache_free (CoglPangoGlyphCache *cache);
|
|
|
|
CoglPangoGlyphCacheValue *
|
|
cogl_pango_glyph_cache_lookup (CoglPangoGlyphCache *cache,
|
|
PangoFont *font,
|
|
PangoGlyph glyph);
|
|
|
|
CoglPangoGlyphCacheValue *
|
|
cogl_pango_glyph_cache_set (CoglPangoGlyphCache *cache,
|
|
PangoFont *font,
|
|
PangoGlyph glyph,
|
|
gconstpointer pixels,
|
|
int width,
|
|
int height,
|
|
int stride,
|
|
int draw_x,
|
|
int draw_y);
|
|
|
|
void
|
|
cogl_pango_glyph_cache_clear (CoglPangoGlyphCache *cache);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __COGL_PANGO_GLYPH_CACHE_H__ */
|