summaryrefslogtreecommitdiff
path: root/src/bin/evas/evas_cserve2_shm_debug.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-10-11 17:18:42 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2013-10-28 15:47:16 +0900
commit15130078156d849f942fb00c4f37bd708bad0c7b (patch)
tree42603e5b79eb86c8b8154f0b4de8d24107ea9b26 /src/bin/evas/evas_cserve2_shm_debug.c
parent7b62d77cf5441b89c17ff082204a6908259bd4c3 (diff)
evas/cserve2: Merge Glyph_Data and mempool index
Glyphs were previously using 3 shared buffers, now reduce to 2: - Memory pool (mempool) containing the glyph drawable data - Index table (Shared_Index / array) containing only the indexes of the buffers in the mempool - Glyph_Data table (array) containing the glyphs descriptors AS WELL as the buffer indexes. So, we just merge the two index tables into one by using directly objects of type Glyph_Data for the referencing of the mempool buffers.
Diffstat (limited to '')
-rw-r--r--src/bin/evas/evas_cserve2_shm_debug.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/bin/evas/evas_cserve2_shm_debug.c b/src/bin/evas/evas_cserve2_shm_debug.c
index 8535af45cd..10bb48453e 100644
--- a/src/bin/evas/evas_cserve2_shm_debug.c
+++ b/src/bin/evas/evas_cserve2_shm_debug.c
@@ -152,11 +152,6 @@ _shm_file_probe(Shm_File *sf)
152 sf_fonts = sf; 152 sf_fonts = sf;
153 break; 153 break;
154 154
155 case GLYPH_INDEX_ARRAY_TAG:
156 DBG("Found index table with tag '%4.4s'", (char *) &sf->header->tag);
157 sf->tag = sf->header->tag;
158 break;
159
160 case GLYPH_DATA_ARRAY_TAG: 155 case GLYPH_DATA_ARRAY_TAG:
161 DBG("Found index table with tag '%4.4s'", (char *) &sf->header->tag); 156 DBG("Found index table with tag '%4.4s'", (char *) &sf->header->tag);
162 sf->tag = sf->header->tag; 157 sf->tag = sf->header->tag;
@@ -647,7 +642,7 @@ _glyphs_all_print(Shm_File *sf)
647 printf(" %8u %6u %6u %5u %5u %5u %5u %5u %1u %1u %6u %6u '%s'\n", 642 printf(" %8u %6u %6u %5u %5u %5u %5u %5u %1u %1u %6u %6u '%s'\n",
648 gd->id, gd->refcount, gd->index, gd->size, gd->rows, gd->width, 643 gd->id, gd->refcount, gd->index, gd->size, gd->rows, gd->width,
649 gd->pitch, gd->num_grays, gd->hint, gd->pixel_mode, gd->buffer_id, 644 gd->pitch, gd->num_grays, gd->hint, gd->pixel_mode, gd->buffer_id,
650 gd->offset, _shared_string_get(gd->shm_id)); 645 gd->offset, _shared_string_get(gd->mempool_id));
651 646
652 nglyphs++; 647 nglyphs++;
653 mem_used += gd->size; 648 mem_used += gd->size;