more dead codeglamor-new-glyphs

2 files changed, 0 insertions, 189 deletions

diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index fa0222c60..480d13bfe 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -154,41 +154,8 @@ enum glamor_gl_flavor {
     GLAMOR_GL_ES2               // OPENGL ES2.0 API
 };
 
-#define GLAMOR_NUM_GLYPH_CACHE_FORMATS 2
-
 #define GLAMOR_COMPOSITE_VBO_VERT_CNT (64*1024)
 
-typedef struct {
-    PicturePtr picture;         /* Where the glyphs of the cache are stored */
-    GlyphPtr *glyphs;
-    uint16_t count;
-    uint16_t evict;
-} glamor_glyph_cache_t;
-
-#define CACHE_PICTURE_SIZE 1024
-#define GLYPH_MIN_SIZE 8
-#define GLYPH_MAX_SIZE	64
-#define GLYPH_CACHE_SIZE ((CACHE_PICTURE_SIZE) * CACHE_PICTURE_SIZE / (GLYPH_MIN_SIZE * GLYPH_MIN_SIZE))
-
-#define MASK_CACHE_MAX_SIZE 32
-#define MASK_CACHE_WIDTH (CACHE_PICTURE_SIZE / MASK_CACHE_MAX_SIZE)
-#define MASK_CACHE_MASK ((1LL << (MASK_CACHE_WIDTH)) - 1)
-
-struct glamor_glyph_mask_cache_entry {
-    int idx;
-    int width;
-    int height;
-    int x;
-    int y;
-};
-
-typedef struct {
-    PixmapPtr pixmap;
-    struct glamor_glyph_mask_cache_entry mcache[MASK_CACHE_WIDTH];
-    unsigned int free_bitmap;
-    unsigned int cleared_bitmap;
-} glamor_glyph_mask_cache_t;
-
 struct glamor_saved_procs {
     CloseScreenProcPtr close_screen;
     CreateScreenResourcesProcPtr create_screen_resources;
@@ -299,9 +266,6 @@ typedef struct glamor_screen_private {
     glamor_composite_shader composite_shader[SHADER_SOURCE_COUNT]
         [SHADER_MASK_COUNT]
         [SHADER_IN_COUNT];
-    glamor_glyph_cache_t glyphCaches[GLAMOR_NUM_GLYPH_CACHE_FORMATS];
-    glamor_glyph_mask_cache_t *mask_cache[GLAMOR_NUM_GLYPH_CACHE_FORMATS];
-    Bool glyph_caches_realized;
 
     /* shaders to restore a texture to another texture. */
     GLint finish_access_prog[2];
@@ -714,17 +678,6 @@ RegionPtr glamor_bitmap_to_region(PixmapPtr pixmap);
 void
 glamor_track_stipple(GCPtr gc);
 
-/* glamor_glyphs.c */
-Bool glamor_realize_glyph_caches(ScreenPtr screen);
-void glamor_glyph_unrealize(ScreenPtr screen, GlyphPtr glyph);
-void glamor_glyphs_fini(ScreenPtr screen);
-void glamor_glyphs(CARD8 op,
-                   PicturePtr pSrc,
-                   PicturePtr pDst,
-                   PictFormatPtr maskFormat,
-                   INT16 xSrc,
-                   INT16 ySrc, int nlist, GlyphListPtr list, GlyphPtr *glyphs);
-
 /* glamor_render.c */
 Bool glamor_composite_clipped_region(CARD8 op,
                                      PicturePtr source,
@@ -751,10 +704,6 @@ void glamor_composite(CARD8 op,
 
 void glamor_init_composite_shaders(ScreenPtr screen);
 void glamor_fini_composite_shaders(ScreenPtr screen);
-void glamor_composite_glyph_rects(CARD8 op,
-                                  PicturePtr src, PicturePtr mask,
-                                  PicturePtr dst, int nrect,
-                                  glamor_composite_rect_t *rects);
 void glamor_composite_rects(CARD8 op,
                             PicturePtr pDst,
                             xRenderColor *color, int nRect, xRectangle *rects);
@@ -1100,8 +1049,6 @@ void glamor_xv_render(glamor_port_private *port_priv);
 #if 0
 #define MAX_FBO_SIZE 32         /* For test purpose only. */
 #endif
-//#define GLYPHS_NO_EDEGEMAP_OVERLAP_CHECK
-#define GLYPHS_EDEGE_OVERLAP_LOOSE_CHECK
 
 #include "glamor_font.h"
 
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 27c09fd48..efca36744 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -1701,139 +1701,3 @@ glamor_composite(CARD8 op,
     glamor_finish_access_picture(source);
     glamor_finish_access_picture(dest);
 }
-
-static void
-glamor_get_src_rect_extent(int nrect,
-                           glamor_composite_rect_t *rects, BoxPtr extent)
-{
-    extent->x1 = MAXSHORT;
-    extent->y1 = MAXSHORT;
-    extent->x2 = MINSHORT;
-    extent->y2 = MINSHORT;
-
-    while (nrect--) {
-        if (extent->x1 > rects->x_src)
-            extent->x1 = rects->x_src;
-        if (extent->y1 > rects->y_src)
-            extent->y1 = rects->y_src;
-        if (extent->x2 < rects->x_src + rects->width)
-            extent->x2 = rects->x_src + rects->width;
-        if (extent->y2 < rects->y_src + rects->height)
-            extent->y2 = rects->y_src + rects->height;
-        rects++;
-    }
-}
-
-static void
-glamor_composite_src_rect_translate(int nrect,
-                                    glamor_composite_rect_t *rects,
-                                    int x, int y)
-{
-    while (nrect--) {
-        rects->x_src += x;
-        rects->y_src += y;
-        rects++;
-    }
-}
-
-void
-glamor_composite_glyph_rects(CARD8 op,
-                             PicturePtr src, PicturePtr mask, PicturePtr dst,
-                             int nrect, glamor_composite_rect_t *rects)
-{
-    int n;
-    PicturePtr temp_src = NULL;
-    glamor_composite_rect_t *r;
-
-    ValidatePicture(src);
-    ValidatePicture(dst);
-    if (!(glamor_is_large_picture(src)
-          || (mask && glamor_is_large_picture(mask))
-          || glamor_is_large_picture(dst))) {
-        PixmapPtr src_pixmap = NULL;
-        PixmapPtr mask_pixmap = NULL;
-        PixmapPtr dst_pixmap = NULL;
-        PixmapPtr temp_src_pixmap = NULL;
-        glamor_pixmap_private *src_pixmap_priv = NULL;
-        glamor_pixmap_private *mask_pixmap_priv = NULL;
-        glamor_pixmap_private *dst_pixmap_priv;
-        glamor_pixmap_private *temp_src_priv = NULL;
-        BoxRec src_extent;
-
-        dst_pixmap = glamor_get_drawable_pixmap(dst->pDrawable);
-        dst_pixmap_priv = glamor_get_pixmap_private(dst_pixmap);
-
-        if (mask && mask->pDrawable) {
-            mask_pixmap = glamor_get_drawable_pixmap(mask->pDrawable);
-            mask_pixmap_priv = glamor_get_pixmap_private(mask_pixmap);
-        }
-        if (src->pDrawable) {
-            src_pixmap = glamor_get_drawable_pixmap(src->pDrawable);
-            src_pixmap_priv = glamor_get_pixmap_private(src_pixmap);
-        }
-
-        if (!src->pDrawable
-            && (src->pSourcePict->type != SourcePictTypeSolidFill)) {
-            glamor_get_src_rect_extent(nrect, rects, &src_extent);
-            temp_src = glamor_convert_gradient_picture(dst->pDrawable->pScreen,
-                                                       src,
-                                                       src_extent.x1,
-                                                       src_extent.y1,
-                                                       src_extent.x2 -
-                                                       src_extent.x1,
-                                                       src_extent.y2 -
-                                                       src_extent.y1);
-            if (!temp_src)
-                goto fallback;
-
-            temp_src_pixmap = (PixmapPtr) (temp_src->pDrawable);
-            temp_src_priv = glamor_get_pixmap_private(temp_src_pixmap);
-            glamor_composite_src_rect_translate(nrect, rects,
-                                                -src_extent.x1, -src_extent.y1);
-        }
-        else {
-            temp_src = src;
-            temp_src_pixmap = src_pixmap;
-            temp_src_priv = src_pixmap_priv;
-        }
-
-        if (mask && mask->componentAlpha) {
-            if (op == PictOpOver) {
-                if (glamor_composite_with_shader(PictOpOutReverse,
-                                                 temp_src, mask, dst,
-                                                 temp_src_pixmap, mask_pixmap, dst_pixmap,
-                                                 temp_src_priv,
-                                                 mask_pixmap_priv,
-                                                 dst_pixmap_priv, nrect, rects,
-                                                 TRUE))
-                    goto done;
-            }
-        }
-        else {
-            if (glamor_composite_with_shader
-                (op, temp_src, mask, dst,
-                 temp_src_pixmap, mask_pixmap, dst_pixmap,
-                 temp_src_priv, mask_pixmap_priv,
-                 dst_pixmap_priv, nrect, rects, FALSE))
-                goto done;
-        }
-    }
- fallback:
-    n = nrect;
-    r = rects;
-
-    while (n--) {
-        CompositePicture(op,
-                         temp_src ? temp_src : src,
-                         mask,
-                         dst,
-                         r->x_src, r->y_src,
-                         r->x_mask, r->y_mask,
-                         r->x_dst, r->y_dst, r->width, r->height);
-        r++;
-    }
-
- done:
-    if (temp_src && temp_src != src)
-        FreePicture(temp_src, 0);
-}