diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-11 09:01:24 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-11 09:01:24 +0200 |
| commit | a660c10f0f261b390ada5c3a5d0543088830f070 (patch) | |
| tree | 522977aa2a1be8687b1399e8afa2503daa58821b /pixman/pixman/pixman.h | |
| parent | 72ec0e3bb2d7fc6b77b2a75873792f781679da6a (diff) | |
| parent | 080d1527a5358dd66ac927acbe0ec61cba7aa7e1 (diff) | |
| download | vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.tar.gz vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.tar.bz2 vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'pixman/pixman/pixman.h')
| -rw-r--r-- | pixman/pixman/pixman.h | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/pixman/pixman/pixman.h b/pixman/pixman/pixman.h index 18d951312..7233ceb8a 100644 --- a/pixman/pixman/pixman.h +++ b/pixman/pixman/pixman.h @@ -868,6 +868,65 @@ void pixman_image_composite32 (pixman_op_t op, void pixman_disable_out_of_bounds_workaround (void); /* + * Glyphs + */ +typedef struct pixman_glyph_cache_t pixman_glyph_cache_t; +typedef struct +{ + int x, y; + const void *glyph; +} pixman_glyph_t; + +pixman_glyph_cache_t *pixman_glyph_cache_create (void); +void pixman_glyph_cache_destroy (pixman_glyph_cache_t *cache); +void pixman_glyph_cache_freeze (pixman_glyph_cache_t *cache); +void pixman_glyph_cache_thaw (pixman_glyph_cache_t *cache); +const void * pixman_glyph_cache_lookup (pixman_glyph_cache_t *cache, + void *font_key, + void *glyph_key); +const void * pixman_glyph_cache_insert (pixman_glyph_cache_t *cache, + void *font_key, + void *glyph_key, + int origin_x, + int origin_y, + pixman_image_t *glyph_image); +void pixman_glyph_cache_remove (pixman_glyph_cache_t *cache, + void *font_key, + void *glyph_key); +void pixman_glyph_get_extents (pixman_glyph_cache_t *cache, + int n_glyphs, + pixman_glyph_t *glyphs, + pixman_box32_t *extents); +pixman_format_code_t pixman_glyph_get_mask_format (pixman_glyph_cache_t *cache, + int n_glyphs, + pixman_glyph_t * glyphs); +void pixman_composite_glyphs (pixman_op_t op, + pixman_image_t *src, + pixman_image_t *dest, + pixman_format_code_t mask_format, + int32_t src_x, + int32_t src_y, + int32_t mask_x, + int32_t mask_y, + int32_t dest_x, + int32_t dest_y, + int32_t width, + int32_t height, + pixman_glyph_cache_t *cache, + int n_glyphs, + pixman_glyph_t *glyphs); +void pixman_composite_glyphs_no_mask (pixman_op_t op, + pixman_image_t *src, + pixman_image_t *dest, + int32_t src_x, + int32_t src_y, + int32_t dest_x, + int32_t dest_y, + pixman_glyph_cache_t *cache, + int n_glyphs, + pixman_glyph_t *glyphs); + +/* * Trapezoids */ typedef struct pixman_edge pixman_edge_t; |