Changeset 1463Tweet

Timestamp:

Jun 13, 2012, 12:02:05 AM (9 years ago)

Author:

sam

Message:

neercs: minor vertex buffer usage optimisation.

File:

• trunk/neercs/video/render.cpp (modified) (2 diffs)

trunk/neercs/video/render.cpp

@@ -535 +535 @@
         float y = dos_m + (float)(15 * ratio_2d);
 
+        /* Background colors */
+        glDisable(GL_TEXTURE_2D);
+        for (int j = 0; j < caca_get_canvas_height(m_caca); j++)
+        for (int i = 0; i < caca_get_canvas_width(m_caca); i++)
+        {
+            uint32_t att = caca_get_attr(m_caca, i, j);
+
+            glLoadIdentity();
+            glTranslated(x+i*(dos_w+2*ratio_2d), y+j*(dos_h+4*ratio_2d), 0);
+
+            uint16_t bg = caca_attr_to_rgb12_bg(att);
+            glColor3f((float)(bg >> 8) / 16.f,
+                      (float)((bg & 0xf0) >> 4) / 16.f,
+                      (float)(bg & 0xf) / 16.f);
+            glDrawArrays(GL_QUADS, 0, 4);
+        }
+        glEnable(GL_TEXTURE_2D);
+
+        /* Foreground characters */
         for (int j = 0; j < caca_get_canvas_height(m_caca); j++)
         for (int i = 0; i < caca_get_canvas_width(m_caca); i++)
@@ -541 +560 @@
             uint32_t att = caca_get_attr(m_caca, i, j);
 
+            if (car <= 32 || car >= 127)
+                continue;
+
             glLoadIdentity();
             glTranslated(x+i*(dos_w+2*ratio_2d), y+j*(dos_h+4*ratio_2d), 0);
 
-            glDisable(GL_TEXTURE_2D);
-            uint16_t bg = caca_attr_to_rgb12_bg(att);
-            glColor3f((float)(bg >> 8) / 16.f,
-                      (float)((bg & 0xf0) >> 4) / 16.f,
-                      (float)(bg & 0xf) / 16.f);
+            float l_w=(car%16)*0.03125f;
+            float l_h=(car-car%16)*0.001953125f;
+            float dos_tex[]={l_w+0.03125f, 0.5f+l_h+0.03125f, l_w+0.03125f, 0.5f+l_h, l_w, 0.5f+l_h, l_w, 0.5f+l_h+0.03125f};
+            glTexCoordPointer(2, GL_FLOAT, 0, dos_tex);
+            uint16_t fg = caca_attr_to_rgb12_fg(att);
+            glColor3f((float)(fg >> 8) / 16.f,
+                      (float)((fg & 0xf0) >> 4) / 16.f,
+                      (float)(fg & 0xf) / 16.f);
+            // FIXME: draw cursor!
+            //if(car==car_cursor) glColor3f(CR*(dos_color.r+64), CR*(dos_color.g+48), CR*(dos_color.b+48));
             glDrawArrays(GL_QUADS, 0, 4);
-            glEnable(GL_TEXTURE_2D);
-
-            if (car > 32 && car < 127)
-            {
-                float l_w=(car%16)*0.03125f;
-                float l_h=(car-car%16)*0.001953125f;
-                float dos_tex[]={l_w+0.03125f, 0.5f+l_h+0.03125f, l_w+0.03125f, 0.5f+l_h, l_w, 0.5f+l_h, l_w, 0.5f+l_h+0.03125f};
-                glTexCoordPointer(2, GL_FLOAT, 0, dos_tex);
-                uint16_t fg = caca_attr_to_rgb12_fg(att);
-                glColor3f((float)(fg >> 8) / 16.f,
-                          (float)((fg & 0xf0) >> 4) / 16.f,
-                          (float)(fg & 0xf) / 16.f);
-                // FIXME: draw cursor!
-                //if(car==car_cursor) glColor3f(CR*(dos_color.r+64), CR*(dos_color.g+48), CR*(dos_color.b+48));
-                glDrawArrays(GL_QUADS, 0, 4);
-                //if(car==car_cursor) glColor3f(1.0f, 1.0f, 1.0f);
-            }
+            //if(car==car_cursor) glColor3f(1.0f, 1.0f, 1.0f);
         }
     }