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.8 by root, Sat Aug 11 11:32:29 2007 UTC vs.
Revision 1.17 by root, Sun Nov 29 14:45:12 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);
181 glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm);
182 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
183 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
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 pango_renderer_draw_layout (renderer, layout, x, y); 303 pango_renderer_draw_layout (renderer, layout, x, y);
279
280 rc_free (gl->rc);
281} 304}
282 305
283void 306void
284pango_opengl_render_layout (PangoLayout *layout, 307pango_opengl_render_layout (PangoLayout *layout,
308 rc_t *rc,
285 int x, int y, 309 int x, int y,
286 float r, float g, float b, float a, 310 float r, float g, float b, float a,
287 int flags) 311 int flags)
288{ 312{
289 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 );
290} 316}
291 317
292static void 318static void
293pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 319pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
294{ 320{
… …
301} 327}
302 328
303static void 329static void
304prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 330prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
305{ 331{
306 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 332 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
307 PangoColor *fg = 0; 333 PangoColor *fg = 0;
308 GSList *l; 334 GSList *l;
309 unsigned char r, g, b, a; 335 unsigned char r, g, b, a;
310 336
311 renderer->underline = PANGO_UNDERLINE_NONE; 337 renderer->underline = PANGO_UNDERLINE_NONE;
312 renderer->strikethrough = FALSE; 338 renderer->strikethrough = FALSE;
313 339
314 glrenderer->key.mode = GL_QUADS; 340 gl->key.mode = GL_QUADS;
315 glrenderer->key.format = GL_T2F_V3F; 341 gl->key.format = 0; // glyphs
316 glrenderer->key.texname = 0; 342 gl->key.texname = 0;
317 343
318 for (l = run->item->analysis.extra_attrs; l; l = l->next) 344 for (l = run->item->analysis.extra_attrs; l; l = l->next)
319 { 345 {
320 PangoAttribute *attr = l->data; 346 PangoAttribute *attr = l->data;
321 347
… …
344 g = fg->green * (255.f / 65535.f); 370 g = fg->green * (255.f / 65535.f);
345 b = fg->blue * (255.f / 65535.f); 371 b = fg->blue * (255.f / 65535.f);
346 } 372 }
347 else 373 else
348 { 374 {
349 r = glrenderer->r * 255.f; 375 r = gl->r * 255.f;
350 g = glrenderer->g * 255.f; 376 g = gl->g * 255.f;
351 b = glrenderer->b * 255.f; 377 b = gl->b * 255.f;
352 } 378 }
353 379
354 a = glrenderer->a * 255.f; 380 a = gl->a * 255.f;
355 381
356 if (glrenderer->flags & FLAG_INVERSE) 382 if (gl->flags & FLAG_INVERSE)
357 { 383 {
358 r ^= 0xffU; 384 r ^= 0xffU;
359 g ^= 0xffU; 385 g ^= 0xffU;
360 b ^= 0xffU; 386 b ^= 0xffU;
361 } 387 }
362 388
363 glrenderer->key.r = r; 389 gl->key.r = r;
364 glrenderer->key.g = g; 390 gl->key.g = g;
365 glrenderer->key.b = b; 391 gl->key.b = b;
366 glrenderer->key.a = a; 392 gl->key.a = a;
367} 393}
368 394
369static void 395static void
370draw_begin (PangoRenderer *renderer_) 396draw_begin (PangoRenderer *renderer_)
371{ 397{
372 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 398 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
373
374 glEnable (GL_TEXTURE_2D);
375 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
376 glEnable (GL_BLEND);
377 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
378 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
379 glEnable (GL_ALPHA_TEST);
380 glAlphaFunc (GL_GREATER, 0.01f);
381} 399}
382 400
383static void 401static void
384draw_end (PangoRenderer *renderer_) 402draw_end (PangoRenderer *renderer_)
385{ 403{
386 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 404 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
387
388 rc_draw (renderer->rc);
389
390 glDisable (GL_ALPHA_TEST);
391 glDisable (GL_BLEND);
392 glDisable (GL_TEXTURE_2D);
393} 405}
394 406
395static void 407static void
396pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 408pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
397{ 409{

Diff Legend

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