[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/pango-render.c

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.3 by root, Tue Jul 4 23:56:34 2006 UTC vs.
Revision 1.4 by root, Wed Jul 5 00:16:44 2006 UTC

           _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
           _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
         }
+      if (renderer->curtex)
+        glEnd ();
       tc_get (&g->tex, bm.width, bm.height);
       g->left = bm.left;
       g->top  = bm.top;
-      if (renderer->curtex)
-        {
-          glEnd ();
-          renderer->curtex = 0;
-        }
       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);
+      renderer->curtex = g->tex.name;
+      glBegin (GL_QUADS);
     }
   x += g->left;
   y -= g->top;
       if (renderer->curtex)
         glEnd ();
       glBindTexture (GL_TEXTURE_2D, g->tex.name);
       renderer->curtex = g->tex.name;
       glBegin (GL_QUADS);
     }
   glTexCoord2f (x1, y1); glVertex2i (x           , y           );
   glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y           );

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines