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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.9 by root, Sat Aug 11 11:41:24 2007 UTC vs.
Revision 1.18 by root, Mon Dec 21 23:52:34 2009 UTC

… …
159{ 159{
160 tc_put (&g->tex); 160 tc_put (&g->tex);
161 g_slice_free (glyph_info, g); 161 g_slice_free (glyph_info, g);
162} 162}
163 163
164static int apple_nvidia_bug_workaround;
165
166static void
167apple_nvidia_bug (int enable)
168{
169 apple_nvidia_bug_workaround = enable;
170}
171
172static void
173tex_update (int name, int x, int y, int w, int stride, int h, void *bm)
174{
175 glBindTexture (GL_TEXTURE_2D, name);
176
177 if (!apple_nvidia_bug_workaround)
178 {
179 glPixelStorei (GL_UNPACK_ROW_LENGTH, stride);
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);
182 /*glPixelStorei (GL_UNPACK_ALIGNMENT, 4);*/
183 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
184 }
185 else
186 {
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, */
189 /* reading/patching/uploading the full texture one each change */
190 int r;
191
192 glGetTexImage (GL_TEXTURE_2D, 0, GL_ALPHA, GL_UNSIGNED_BYTE, tc_temptile);
193
194 for (r = 0; r < h; ++r)
195 memcpy (tc_temptile + (y + r) * TC_WIDTH + x, (char *)bm + r * stride, w);
196
197 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, TC_WIDTH, TC_HEIGHT, 0, GL_ALPHA, GL_UNSIGNED_BYTE, tc_temptile);
198 }
199}
200
164static void 201static void
165draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 202draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
166{ 203{
167 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 204 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
168 glyph_info *g; 205 glyph_info *g;
169 float x1, y1, x2, y2;
170 206
171 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 207 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
172 { 208 {
173 glyph = pango_opengl_get_unknown_glyph (font); 209 glyph = pango_opengl_get_unknown_glyph (font);
174 210
… …
181 if (!g || g->generation != tc_generation) 217 if (!g || g->generation != tc_generation)
182 { 218 {
183 Glyph bm; 219 Glyph bm;
184 font_render_glyph (&bm, font, glyph); 220 font_render_glyph (&bm, font, glyph);
185 221
186 if (g) 222 if (!g)
187 g->generation = tc_generation;
188 else
189 { 223 {
190 g = g_slice_new (glyph_info); 224 g = g_slice_new (glyph_info);
191 225
192 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info); 226 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
193 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 227 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
194 } 228 }
195 229
196 tc_get (&g->tex, bm.width, bm.height); 230 g->generation = tc_generation;
197 231
198 g->left = bm.left; 232 g->left = bm.left;
199 g->top = bm.top; 233 g->top = bm.top;
200 234
201 glBindTexture (GL_TEXTURE_2D, g->tex.name); 235 tc_get (&g->tex, bm.width, bm.height);
202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 236
203 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 237 if (bm.width && bm.height)
204 glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap); 238 tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
205 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
206 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
207 } 239 }
208 240
209 x += g->left; 241 x += g->left;
210 y -= g->top; 242 y -= g->top;
211 243
212 x1 = g->tex.x * (1. / TC_WIDTH );
213 y1 = g->tex.y * (1. / TC_HEIGHT);
214 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
215 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
216
217 if (g->tex.name != renderer->key.texname) 244 if (g->tex.name != renderer->key.texname)
218 { 245 {
219 renderer->key.texname = g->tex.name; 246 renderer->key.texname = g->tex.name;
220 renderer->arr = rc_array (renderer->rc, &renderer->key); 247 renderer->arr = rc_array (renderer->rc, &renderer->key);
221 } 248 }
222 249
223 rc_t2f_v3f (renderer->arr, x1, y1, x , y , 0); 250 rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
224 rc_t2f_v3f (renderer->arr, x2, y1, x + g->tex.w, y , 0);
225 rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
226 rc_t2f_v3f (renderer->arr, x1, y2, x , y + g->tex.h, 0);
227} 251}
228 252
229static void 253static void
230draw_trapezoid (PangoRenderer *renderer_, 254draw_trapezoid (PangoRenderer *renderer_,
231 PangoRenderPart part, 255 PangoRenderPart part,
… …
252 rc_v2f (arr, x12, y2); 276 rc_v2f (arr, x12, y2);
253} 277}
254 278
255void 279void
256pango_opengl_render_layout_subpixel (PangoLayout *layout, 280pango_opengl_render_layout_subpixel (PangoLayout *layout,
281 rc_t *rc,
257 int x, int y, 282 int x, int y,
258 float r, float g, float b, float a, 283 float r, float g, float b, float a,
259 int flags) 284 int flags)
260{ 285{
261 PangoContext *context; 286 PangoContext *context;
… …
266 context = pango_layout_get_context (layout); 291 context = pango_layout_get_context (layout);
267 fontmap = pango_context_get_font_map (context); 292 fontmap = pango_context_get_font_map (context);
268 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 293 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
269 gl = PANGO_OPENGL_RENDERER (renderer); 294 gl = PANGO_OPENGL_RENDERER (renderer);
270 295
271 gl->rc = rc_alloc (); 296 gl->rc = rc;
272 gl->r = r; 297 gl->r = r;
273 gl->g = g; 298 gl->g = g;
274 gl->b = b; 299 gl->b = b;
275 gl->a = a; 300 gl->a = a;
276 gl->flags = flags; 301 gl->flags = flags;
277 302
278 glEnable (GL_TEXTURE_2D);
279 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
280 glEnable (GL_BLEND);
281 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
282 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
283 glEnable (GL_ALPHA_TEST);
284 glAlphaFunc (GL_GREATER, 0.01f);
285
286 pango_renderer_draw_layout (renderer, layout, x, y); 303 pango_renderer_draw_layout (renderer, layout, x, y);
287
288 rc_draw (gl->rc);
289
290 glDisable (GL_ALPHA_TEST);
291 glDisable (GL_BLEND);
292 glDisable (GL_TEXTURE_2D);
293
294 rc_free (gl->rc);
295} 304}
296 305
297void 306void
298pango_opengl_render_layout (PangoLayout *layout, 307pango_opengl_render_layout (PangoLayout *layout,
308 rc_t *rc,
299 int x, int y, 309 int x, int y,
300 float r, float g, float b, float a, 310 float r, float g, float b, float a,
301 int flags) 311 int flags)
302{ 312{
303 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags); 313 pango_opengl_render_layout_subpixel (
314 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
315 );
304} 316}
305 317
306static void 318static void
307pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 319pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
308{ 320{
… …
324 336
325 renderer->underline = PANGO_UNDERLINE_NONE; 337 renderer->underline = PANGO_UNDERLINE_NONE;
326 renderer->strikethrough = FALSE; 338 renderer->strikethrough = FALSE;
327 339
328 gl->key.mode = GL_QUADS; 340 gl->key.mode = GL_QUADS;
329 gl->key.format = GL_T2F_V3F; 341 gl->key.format = 0; // glyphs
330 gl->key.texname = 0; 342 gl->key.texname = 0;
331 343
332 for (l = run->item->analysis.extra_attrs; l; l = l->next) 344 for (l = run->item->analysis.extra_attrs; l; l = l->next)
333 { 345 {
334 PangoAttribute *attr = l->data; 346 PangoAttribute *attr = l->data;

Diff Legend

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