--- deliantra/Deliantra-Client/pango-render.c	2007/08/11 11:41:24	1.9
+++ deliantra/Deliantra-Client/pango-render.c	2009/12/21 23:52:34	1.18
@@ -161,12 +161,48 @@
   g_slice_free (glyph_info, g);
 }
 
+static int apple_nvidia_bug_workaround;
+
+static void
+apple_nvidia_bug (int enable)
+{
+  apple_nvidia_bug_workaround = enable;
+}
+
+static void
+tex_update (int name, int x, int y, int w, int stride, int h, void *bm)
+{
+  glBindTexture (GL_TEXTURE_2D, name);
+
+  if (!apple_nvidia_bug_workaround)
+    {
+      glPixelStorei (GL_UNPACK_ROW_LENGTH, stride);
+      /*glPixelStorei (GL_UNPACK_ALIGNMENT, 1); expected cfplus default */
+      glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm);
+      /*glPixelStorei (GL_UNPACK_ALIGNMENT, 4);*/
+      glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
+    }
+  else
+    {
+      /* starting with 10.5.5 (or 10.5.6), pple's nvidia driver corrupts textures */
+      /* when glTexSubImage is used, so do it the horribly slow way, */
+      /* reading/patching/uploading the full texture one each change */
+      int r;
+
+      glGetTexImage (GL_TEXTURE_2D, 0, GL_ALPHA, GL_UNSIGNED_BYTE, tc_temptile);
+
+      for (r = 0; r < h; ++r)
+        memcpy (tc_temptile + (y + r) * TC_WIDTH + x, (char *)bm + r * stride, w);
+
+      glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, TC_WIDTH, TC_HEIGHT, 0, GL_ALPHA, GL_UNSIGNED_BYTE, tc_temptile);
+    }
+}
+
 static void
 draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
 {
   PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
   glyph_info *g;
-  float x1, y1, x2, y2;
 
   if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
     {
@@ -183,9 +219,7 @@
       Glyph bm;
       font_render_glyph (&bm, font, glyph);
 
-      if (g)
-        g->generation = tc_generation;
-      else
+      if (!g)
         {
           g = g_slice_new (glyph_info);
 
@@ -193,37 +227,27 @@
           _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
         }
 
-      tc_get (&g->tex, bm.width, bm.height);
+      g->generation = tc_generation;
 
       g->left = bm.left;
       g->top  = bm.top;
 
-      glBindTexture (GL_TEXTURE_2D, g->tex.name);
-      glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
-      glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
-      glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
-      glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
-      glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
+      tc_get (&g->tex, bm.width, bm.height);
+
+      if (bm.width && bm.height)
+        tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
     }
 
   x += g->left;
   y -= g->top;
 
-  x1 = g->tex.x * (1. / TC_WIDTH );
-  y1 = g->tex.y * (1. / TC_HEIGHT);
-  x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
-  y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
-
   if (g->tex.name != renderer->key.texname)
     {
       renderer->key.texname = g->tex.name;
       renderer->arr = rc_array (renderer->rc, &renderer->key);
     }
 
-  rc_t2f_v3f (renderer->arr, x1, y1, x           , y           , 0);
-  rc_t2f_v3f (renderer->arr, x2, y1, x + g->tex.w, y           , 0);
-  rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
-  rc_t2f_v3f (renderer->arr, x1, y2, x           , y + g->tex.h, 0);
+  rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
 }
 
 static void
@@ -254,6 +278,7 @@
 
 void 
 pango_opengl_render_layout_subpixel (PangoLayout *layout,
+                                     rc_t *rc,
                                      int x, int y,
                                      float r, float g, float b, float a,
                                      int flags)
@@ -268,39 +293,26 @@
   renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
   gl = PANGO_OPENGL_RENDERER (renderer);
 
-  gl->rc = rc_alloc ();
+  gl->rc = rc;
   gl->r = r;
   gl->g = g;
   gl->b = b;
   gl->a = a;
   gl->flags = flags;
   
-  glEnable (GL_TEXTURE_2D);
-  glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-  glEnable (GL_BLEND);
-  gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
-                        GL_ONE      , GL_ONE_MINUS_SRC_ALPHA);
-  glEnable (GL_ALPHA_TEST);
-  glAlphaFunc (GL_GREATER, 0.01f);
-
   pango_renderer_draw_layout (renderer, layout, x, y);
-
-  rc_draw (gl->rc);
-
-  glDisable (GL_ALPHA_TEST);
-  glDisable (GL_BLEND);
-  glDisable (GL_TEXTURE_2D);
-
-  rc_free (gl->rc);
 }
 
 void 
 pango_opengl_render_layout (PangoLayout *layout,
+                            rc_t *rc,
 			    int x, int y,
                             float r, float g, float b, float a,
                             int flags)
 {
-  pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags);
+  pango_opengl_render_layout_subpixel (
+    layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
+  );
 }
 
 static void
@@ -326,7 +338,7 @@
   renderer->strikethrough = FALSE;
 
   gl->key.mode    = GL_QUADS;
-  gl->key.format  = GL_T2F_V3F;
+  gl->key.format  = 0; // glyphs
   gl->key.texname = 0;
 
   for (l = run->item->analysis.extra_attrs; l; l = l->next)