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.7 by root, Sat Aug 11 11:28:03 2007 UTC vs.
Revision 1.16 by root, Thu Nov 26 07:19:11 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 char *apple_nvidia_bug_buf;
165
166static void
167apple_nvidia_bug (int enable)
168{
169 g_slice_free1 (TC_WIDTH * TC_HEIGHT, apple_nvidia_bug_buf);
170 apple_nvidia_bug_buf = enable ? g_slice_alloc (TC_WIDTH * TC_HEIGHT) : 0;
171}
172
173static void
174tex_update (int name, int x, int y, int w, int stride, int h, void *bm)
175{
176 glBindTexture (GL_TEXTURE_2D, name);
177
178 if (!apple_nvidia_bug_buf)
179 {
180 glPixelStorei (GL_UNPACK_ROW_LENGTH, stride);
181 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
182 glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm);
183 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
184 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
185 }
186 else
187 {
188 /* starting with 10.5.5 (or 10.5.6), pple's nvidia driver corrupts textures */
189 /* when glTexSubImage is used, so do it the horribly slow way, */
190 /* reading/patching/uploading the full texture one each change */
191 int r;
192
193 glGetTexImage (GL_TEXTURE_2D, 0, GL_ALPHA, GL_UNSIGNED_BYTE, apple_nvidia_bug_buf);
194
195 for (r = 0; r < h; ++r)
196 memcpy ((char *)apple_nvidia_bug_buf + (y + r) * TC_WIDTH + x, (char *)bm + r * stride, w);
197
198 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, TC_WIDTH, TC_HEIGHT, 0, GL_ALPHA, GL_UNSIGNED_BYTE, apple_nvidia_bug_buf);
199 }
200}
201
164static void 202static void
165draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 203draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
166{ 204{
167 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 205 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
168 glyph_info *g; 206 glyph_info *g;
169 float x1, y1, x2, y2;
170 207
171 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 208 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
172 { 209 {
173 glyph = pango_opengl_get_unknown_glyph (font); 210 glyph = pango_opengl_get_unknown_glyph (font);
174 211
… …
181 if (!g || g->generation != tc_generation) 218 if (!g || g->generation != tc_generation)
182 { 219 {
183 Glyph bm; 220 Glyph bm;
184 font_render_glyph (&bm, font, glyph); 221 font_render_glyph (&bm, font, glyph);
185 222
186 if (g) 223 if (!g)
187 g->generation = tc_generation;
188 else
189 { 224 {
190 g = g_slice_new (glyph_info); 225 g = g_slice_new (glyph_info);
191 226
192 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info); 227 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
193 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 228 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
194 } 229 }
195 230
196 tc_get (&g->tex, bm.width, bm.height); 231 g->generation = tc_generation;
197 232
198 g->left = bm.left; 233 g->left = bm.left;
199 g->top = bm.top; 234 g->top = bm.top;
200 235
201 glBindTexture (GL_TEXTURE_2D, g->tex.name); 236 tc_get (&g->tex, bm.width, bm.height);
202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 237
203 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 238 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); 239 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 } 240 }
208 241
209 x += g->left; 242 x += g->left;
210 y -= g->top; 243 y -= g->top;
211 244
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) 245 if (g->tex.name != renderer->key.texname)
218 { 246 {
219 renderer->key.texname = g->tex.name; 247 renderer->key.texname = g->tex.name;
220 renderer->arr = rc_array (renderer->rc, &renderer->key); 248 renderer->arr = rc_array (renderer->rc, &renderer->key);
221 } 249 }
222 250
223 rc_t2f_v3f (x1, y1, x , y , 0); 251 rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
224 rc_t2f_v3f (x2, y1, x + g->tex.w, y , 0);
225 rc_t2f_v3f (x2, y2, x + g->tex.w, y + g->tex.h, 0);
226 rc_t2f_v3f (x1, y2, x , y + g->tex.h, 0);
227} 252}
228 253
229static void 254static void
230draw_trapezoid (PangoRenderer *renderer_, 255draw_trapezoid (PangoRenderer *renderer_,
231 PangoRenderPart part, 256 PangoRenderPart part,
… …
244 key.format = GL_V2F; 269 key.format = GL_V2F;
245 key.texname = 0; 270 key.texname = 0;
246 271
247 arr = rc_array (renderer->rc, &key); 272 arr = rc_array (renderer->rc, &key);
248 273
249 rc_v2f (x11, y1); 274 rc_v2f (arr, x11, y1);
250 rc_v2f (x21, y1); 275 rc_v2f (arr, x21, y1);
251 rc_v2f (x22, y2); 276 rc_v2f (arr, x22, y2);
252 rc_v2f (x12, y2); 277 rc_v2f (arr, x12, y2);
253} 278}
254 279
255void 280void
256pango_opengl_render_layout_subpixel (PangoLayout *layout, 281pango_opengl_render_layout_subpixel (PangoLayout *layout,
282 rc_t *rc,
257 int x, int y, 283 int x, int y,
258 float r, float g, float b, float a, 284 float r, float g, float b, float a,
259 int flags) 285 int flags)
260{ 286{
261 PangoContext *context; 287 PangoContext *context;
262 PangoFontMap *fontmap; 288 PangoFontMap *fontmap;
263 PangoRenderer *renderer; 289 PangoRenderer *renderer;
290 PangoOpenGLRenderer *gl;
264 291
265 context = pango_layout_get_context (layout); 292 context = pango_layout_get_context (layout);
266 fontmap = pango_context_get_font_map (context); 293 fontmap = pango_context_get_font_map (context);
267 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 294 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
268
269 PANGO_OPENGL_RENDERER (renderer)->r = r; 295 gl = PANGO_OPENGL_RENDERER (renderer);
270 PANGO_OPENGL_RENDERER (renderer)->g = g; 296
271 PANGO_OPENGL_RENDERER (renderer)->b = b; 297 gl->rc = rc;
272 PANGO_OPENGL_RENDERER (renderer)->a = a; 298 gl->r = r;
273 PANGO_OPENGL_RENDERER (renderer)->flags = flags; 299 gl->g = g;
300 gl->b = b;
301 gl->a = a;
302 gl->flags = flags;
274 303
275 pango_renderer_draw_layout (renderer, layout, x, y); 304 pango_renderer_draw_layout (renderer, layout, x, y);
276} 305}
277 306
278void 307void
279pango_opengl_render_layout (PangoLayout *layout, 308pango_opengl_render_layout (PangoLayout *layout,
309 rc_t *rc,
280 int x, int y, 310 int x, int y,
281 float r, float g, float b, float a, 311 float r, float g, float b, float a,
282 int flags) 312 int flags)
283{ 313{
284 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags); 314 pango_opengl_render_layout_subpixel (
315 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
316 );
285} 317}
286 318
287static void 319static void
288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 320pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
289{ 321{
… …
296} 328}
297 329
298static void 330static void
299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 331prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
300{ 332{
301 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 333 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
302 PangoColor *fg = 0; 334 PangoColor *fg = 0;
303 GSList *l; 335 GSList *l;
304 unsigned char r, g, b, a; 336 unsigned char r, g, b, a;
305 337
306 renderer->underline = PANGO_UNDERLINE_NONE; 338 renderer->underline = PANGO_UNDERLINE_NONE;
307 renderer->strikethrough = FALSE; 339 renderer->strikethrough = FALSE;
308 340
309 renderer->key.mode = GL_QUADS; 341 gl->key.mode = GL_QUADS;
310 renderer->key.format = GL_T2F_V2F; 342 gl->key.format = 0; // glyphs
311 renderer->key.texname = 0; 343 gl->key.texname = 0;
312 344
313 for (l = run->item->analysis.extra_attrs; l; l = l->next) 345 for (l = run->item->analysis.extra_attrs; l; l = l->next)
314 { 346 {
315 PangoAttribute *attr = l->data; 347 PangoAttribute *attr = l->data;
316 348
… …
339 g = fg->green * (255.f / 65535.f); 371 g = fg->green * (255.f / 65535.f);
340 b = fg->blue * (255.f / 65535.f); 372 b = fg->blue * (255.f / 65535.f);
341 } 373 }
342 else 374 else
343 { 375 {
344 r = glrenderer->r * 255.f; 376 r = gl->r * 255.f;
345 g = glrenderer->g * 255.f; 377 g = gl->g * 255.f;
346 b = glrenderer->b * 255.f; 378 b = gl->b * 255.f;
347 } 379 }
348 380
349 a = glrenderer->a * 255.f; 381 a = gl->a * 255.f;
350 382
351 if (glrenderer->flags & FLAG_INVERSE) 383 if (gl->flags & FLAG_INVERSE)
352 { 384 {
353 r ^= 0xffU; 385 r ^= 0xffU;
354 g ^= 0xffU; 386 g ^= 0xffU;
355 b ^= 0xffU; 387 b ^= 0xffU;
356 } 388 }
357 389
358 renderer->key.r = r; 390 gl->key.r = r;
359 renderer->key.g = g; 391 gl->key.g = g;
360 renderer->key.b = b; 392 gl->key.b = b;
361 renderer->key.a = a; 393 gl->key.a = a;
362} 394}
363 395
364static void 396static void
365draw_begin (PangoRenderer *renderer_) 397draw_begin (PangoRenderer *renderer_)
366{ 398{
367 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 399 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
368
369 glEnable (GL_TEXTURE_2D);
370 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
371 glEnable (GL_BLEND);
372 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
373 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
374 glEnable (GL_ALPHA_TEST);
375 glAlphaFunc (GL_GREATER, 0.01f);
376} 400}
377 401
378static void 402static void
379draw_end (PangoRenderer *renderer_) 403draw_end (PangoRenderer *renderer_)
380{ 404{
381 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 405 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
382
383 rc_draw (renderer->rc);
384
385 glDisable (GL_ALPHA_TEST);
386 glDisable (GL_BLEND);
387 glDisable (GL_TEXTURE_2D);
388} 406}
389 407
390static void 408static void
391pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 409pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
392{ 410{

Diff Legend

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