Changeset 532Tweet

Timestamp:

Mar 6, 2006, 2:43:23 PM (15 years ago)

Author:

Sam Hocevar

Message:

• src/graphics.c: minor optimisations.

File:

• libcaca/trunk/src/graphics.c (modified) (4 diffs)

libcaca/trunk/src/graphics.c

@@ -1083 +1083 @@
     if(kk->driver == CACA_DRIVER_GL)
     {
-        unsigned int x, y, offsetx, offsety;
+        unsigned int x, y, line;
 
         glClear(GL_COLOR_BUFFER_BIT);
 
-        offsety = 0;
+        line = 0;
         for(y = 0; y < kk->gl.height; y += kk->gl.font_height)
         {
-            offsetx = 0;
+            uint8_t *attr = kk->qq->attr + line * kk->qq->width;
+
             for(x = 0; x < kk->gl.width; x += kk->gl.font_width)
             {
-                uint8_t *attr = kk->qq->attr + offsetx + offsety * kk->qq->width;
-                int offset;
-
-                offset = attr[0] >> 4;
-
                 glDisable(GL_TEXTURE_2D);
-                glColor4bv(gl_bgpal[offset]);
+                glColor4bv(gl_bgpal[attr[0] >> 4]);
                 glBegin(GL_QUADS);
                     glVertex2f(x, y);
@@ -1107 +1103 @@
                 glEnd();
 
-                offsetx++;
+                attr++;
             }
 
-            offsety++;
+            line++;
         }
 
@@ -1118 +1114 @@
         glBlendFunc(GL_ONE, GL_ONE);
 
-        offsety = 0;
+        line = 0;
         for(y = 0; y < kk->gl.height; y += kk->gl.font_height)
         {
-            offsetx = 0;
+            uint8_t *attr = kk->qq->attr + line * kk->qq->width;
+            unsigned char *chars = kk->qq->chars + line * kk->qq->width;
+
             for(x = 0; x < kk->gl.width; x += kk->gl.font_width)
             {
-                uint8_t *attr = kk->qq->attr + offsetx + offsety * kk->qq->width;
-                unsigned char *chr = kk->qq->chars + offsetx + offsety * kk->qq->width;
-
-                if(chr[0] != ' ')
+                if(chars[0] != ' ')
                 {
-                    glBindTexture(GL_TEXTURE_2D, kk->gl.id[chr[0]-32]);
+                    glBindTexture(GL_TEXTURE_2D, kk->gl.id[chars[0]-32]);
                     glColor4bv(gl_bgpal[attr[0] & 0xf]);
                     glBegin(GL_QUADS);
@@ -1142 +1137 @@
                     glEnd();
                 }
-                offsetx++;
+
+                attr++;
+                chars++;
             }
-            offsety++;
+            line++;
         }
         glDisable(GL_BLEND);