Changeset 4527fb5 in mainline

Timestamp:

2009-04-04T21:13:26Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f2b8cdc

Parents:

67ebf21

Message:

The pre-rendered glyphs are not viewport-specific. This was taking too much time and memory.

File:

• uspace/srv/fb/fb.c (modified) (13 diffs)

uspace/srv/fb/fb.c

@@ -94 +94 @@
         unsigned int pixelbytes;
         unsigned int glyphbytes;
+
+        /** Pre-rendered mask for rendering glyphs. Specific for the visual. */
+        uint8_t *glyphs;
         
         rgb_conv_t rgb_conv;
@@ -123 +126 @@
         attr_rgb_t attr;
 
-        /** Pre-rendered mask for rendering glyphs. Different viewports
+        uint8_t *bgpixel;
+
+        /**
+         * Glyph drawing function for this viewport.  Different viewports
          * might use different drawing functions depending on whether their
-         * scanlines are aligned on a word boundary.*/
-        uint8_t *glyphs;
-
-        uint8_t *bgpixel;
-
-        /** Glyph drawing function for this viewport. */
+         * scanlines are aligned on a word boundary.
+         */
         dg_t dglyph;
         
@@ -422 +424 @@
                         }
 
-                        (*vport->dglyph)(x, y, false, vport->glyphs, glyph,
+                        (*vport->dglyph)(x, y, false, screen.glyphs, glyph,
                             fg_color, bg_color);
                         x += FONT_WIDTH;
@@ -450 +452 @@
  * Convert glyphs from device independent font
  * description to current visual representation.
- *
- * @param vport Viewport
- *
- */
-static void render_glyphs(viewport_t* vport)
+ */
+static void render_glyphs(void)
 {
         unsigned int glyph;
-        
+
         for (glyph = 0; glyph < FONT_GLYPHS; glyph++) {
                 unsigned int y;
-                
+
                 for (y = 0; y < FONT_SCANLINES; y++) {
                         unsigned int x;
-                        
+
                         for (x = 0; x < FONT_WIDTH; x++) {
-                                screen.rgb_conv(&vport->glyphs[GLYPH_POS(glyph, y, false) + x * screen.pixelbytes],
+                                screen.rgb_conv(&screen.glyphs[GLYPH_POS(glyph, y, false) + x * screen.pixelbytes],
                                     (fb_font[glyph][y] & (1 << (7 - x)))
                                     ? 0xffffff : 0x000000);
-                                
-                                screen.rgb_conv(&vport->glyphs[GLYPH_POS(glyph, y, true) + x * screen.pixelbytes],
+
+                                screen.rgb_conv(&screen.glyphs[GLYPH_POS(glyph, y, true) + x * screen.pixelbytes],
                                     (fb_font[glyph][y] & (1 << (7 - x)))
                                     ? 0x000000 : 0xffffff);
@@ -475 +474 @@
                 }
         }
-        
-        screen.rgb_conv(vport->bgpixel, vport->attr.bg_color);
 }
 
@@ -505 +502 @@
         unsigned int rows = height / FONT_SCANLINES;
         unsigned int bbsize = cols * rows * sizeof(bb_cell_t);
-        unsigned int glyphsize = 2 * FONT_GLYPHS * screen.glyphbytes;
         unsigned int word_size = sizeof(unsigned long);
         
@@ -512 +508 @@
                 return ENOMEM;
         
-        uint8_t *glyphs = (uint8_t *) malloc(glyphsize);
-        if (!glyphs) {
+        uint8_t *bgpixel = (uint8_t *) malloc(screen.pixelbytes);
+        if (!bgpixel) {
                 free(backbuf);
                 return ENOMEM;
         }
-        
-        uint8_t *bgpixel = (uint8_t *) malloc(screen.pixelbytes);
-        if (!bgpixel) {
-                free(glyphs);
-                free(backbuf);
-                return ENOMEM;
-        }
 
         backbuf_clear(backbuf, cols * rows, DEFAULT_FGCOLOR, DEFAULT_BGCOLOR);
-        memset(glyphs, 0, glyphsize);
         memset(bgpixel, 0, screen.pixelbytes);
         
@@ -540 +528 @@
         viewports[i].attr.fg_color = DEFAULT_FGCOLOR;
         
-        viewports[i].glyphs = glyphs;
         viewports[i].bgpixel = bgpixel;
 
@@ -570 +557 @@
         viewports[i].initialized = true;
         
-        render_glyphs(&viewports[i]);
+        screen.rgb_conv(viewports[i].bgpixel, viewports[i].attr.bg_color);
         
         return i;
@@ -588 +575 @@
     unsigned int scan, unsigned int visual)
 {
+        unsigned int glyphsize;
+        uint8_t *glyphs;
         switch (visual) {
         case VISUAL_INDIRECT_8:
@@ -632 +621 @@
         screen.glyphscanline = FONT_WIDTH * screen.pixelbytes;
         screen.glyphbytes = screen.glyphscanline * FONT_SCANLINES;
+
+        glyphsize = 2 * FONT_GLYPHS * screen.glyphbytes;
+        glyphs = (uint8_t *) malloc(glyphsize);
+        if (!glyphs)
+                return false;
+        
+        memset(glyphs, 0, glyphsize);
+        screen.glyphs = glyphs;
+
+        render_glyphs();
         
         /* Create first viewport */
@@ -789 +788 @@
         bg_color = vport->backbuf[BB_POS(vport, col, row)].bg_color;
 
-        (*vport->dglyph)(x, y, cursor, vport->glyphs, glyph,
+        (*vport->dglyph)(x, y, cursor, screen.glyphs, glyph,
             fg_color, bg_color);
 }
@@ -1635 +1634 @@
                         }
                         viewports[i].initialized = false;
-                        if (viewports[i].glyphs)
-                                free(viewports[i].glyphs);
                         if (viewports[i].bgpixel)
                                 free(viewports[i].bgpixel);