ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/Deliantra-Client/pango-render.c
(Generate patch)

Comparing cf.schmorp.de/Deliantra-Client/pango-render.c (file contents):
Revision 1.17 by root, Sun Nov 29 14:45:12 2009 UTC vs.
Revision 1.18 by root, Mon Dec 21 23:52:34 2009 UTC

175 glBindTexture (GL_TEXTURE_2D, name); 175 glBindTexture (GL_TEXTURE_2D, name);
176 176
177 if (!apple_nvidia_bug_workaround) 177 if (!apple_nvidia_bug_workaround)
178 { 178 {
179 glPixelStorei (GL_UNPACK_ROW_LENGTH, stride); 179 glPixelStorei (GL_UNPACK_ROW_LENGTH, stride);
180 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 180 /*glPixelStorei (GL_UNPACK_ALIGNMENT, 1); expected cfplus default */
181 glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm); 181 glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm);
182 /*glPixelStorei (GL_UNPACK_ALIGNMENT, 4);*/
182 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); 183 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
183 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
184 } 184 }
185 else 185 else
186 { 186 {
187 /* starting with 10.5.5 (or 10.5.6), pple's nvidia driver corrupts textures */ 187 /* starting with 10.5.5 (or 10.5.6), pple's nvidia driver corrupts textures */
188 /* when glTexSubImage is used, so do it the horribly slow way, */ 188 /* when glTexSubImage is used, so do it the horribly slow way, */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines