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.6 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.16 by root, Thu Nov 26 07:19:11 2009 UTC

… …
36struct _PangoOpenGLRenderer 36struct _PangoOpenGLRenderer
37{ 37{
38 PangoRenderer parent_instance; 38 PangoRenderer parent_instance;
39 float r, g, b, a; // modulate 39 float r, g, b, a; // modulate
40 int flags; 40 int flags;
41 GLuint curtex; // current texture 41 rc_t *rc; // rendercache
42 rc_key_t key; // current render key
43 rc_array_t *arr;
42}; 44};
43 45
44G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER) 46G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER)
45 47
46typedef struct 48typedef struct
… …
157{ 159{
158 tc_put (&g->tex); 160 tc_put (&g->tex);
159 g_slice_free (glyph_info, g); 161 g_slice_free (glyph_info, g);
160} 162}
161 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
162static void 202static void
163draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 203draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
164{ 204{
165 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 205 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
166 glyph_info *g; 206 glyph_info *g;
167 float x1, y1, x2, y2;
168 207
169 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 208 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
170 { 209 {
171 glyph = pango_opengl_get_unknown_glyph (font); 210 glyph = pango_opengl_get_unknown_glyph (font);
172 211
… …
179 if (!g || g->generation != tc_generation) 218 if (!g || g->generation != tc_generation)
180 { 219 {
181 Glyph bm; 220 Glyph bm;
182 font_render_glyph (&bm, font, glyph); 221 font_render_glyph (&bm, font, glyph);
183 222
184 if (g) 223 if (!g)
185 g->generation = tc_generation;
186 else
187 { 224 {
188 g = g_slice_new (glyph_info); 225 g = g_slice_new (glyph_info);
189 226
190 _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);
191 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 228 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
192 } 229 }
193 230
194 if (renderer->curtex) 231 g->generation = tc_generation;
195 glEnd ();
196
197 tc_get (&g->tex, bm.width, bm.height);
198 232
199 g->left = bm.left; 233 g->left = bm.left;
200 g->top = bm.top; 234 g->top = bm.top;
201 235
202 glBindTexture (GL_TEXTURE_2D, g->tex.name); 236 tc_get (&g->tex, bm.width, bm.height);
203 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
204 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
205 glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
206 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
207 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
208 237
209 renderer->curtex = g->tex.name; 238 if (bm.width && bm.height)
210 glBegin (GL_QUADS); 239 tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
211 } 240 }
212 241
213 x += g->left; 242 x += g->left;
214 y -= g->top; 243 y -= g->top;
215 244
216 x1 = g->tex.x * (1. / TC_WIDTH );
217 y1 = g->tex.y * (1. / TC_HEIGHT);
218 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
219 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
220
221 if (g->tex.name != renderer->curtex) 245 if (g->tex.name != renderer->key.texname)
222 { 246 {
223 if (renderer->curtex)
224 glEnd ();
225
226 glBindTexture (GL_TEXTURE_2D, g->tex.name);
227 renderer->curtex = g->tex.name; 247 renderer->key.texname = g->tex.name;
228 248 renderer->arr = rc_array (renderer->rc, &renderer->key);
229 glBegin (GL_QUADS);
230 } 249 }
231 250
232 glTexCoord2f (x1, y1); glVertex2i (x , y ); 251 rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
233 glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
234 glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
235 glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
236} 252}
237 253
238static void 254static void
239draw_trapezoid (PangoRenderer *renderer_, 255draw_trapezoid (PangoRenderer *renderer_,
240 PangoRenderPart part, 256 PangoRenderPart part,
… …
244 double y2, 260 double y2,
245 double x12, 261 double x12,
246 double x22) 262 double x22)
247{ 263{
248 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 264 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
265 rc_key_t key = renderer->key;
266 rc_array_t *arr;
249 267
250 if (renderer->curtex) 268 key.mode = GL_QUADS;
251 { 269 key.format = GL_V2F;
252 glEnd (); 270 key.texname = 0;
253 renderer->curtex = 0;
254 }
255 271
256 glDisable (GL_TEXTURE_2D); 272 arr = rc_array (renderer->rc, &key);
257 273
258 glBegin (GL_QUADS); 274 rc_v2f (arr, x11, y1);
259 glVertex2d (x11, y1); 275 rc_v2f (arr, x21, y1);
260 glVertex2d (x21, y1); 276 rc_v2f (arr, x22, y2);
261 glVertex2d (x22, y2); 277 rc_v2f (arr, x12, y2);
262 glVertex2d (x12, y2);
263 glEnd ();
264
265 glEnable (GL_TEXTURE_2D);
266} 278}
267 279
268void 280void
269pango_opengl_render_layout_subpixel (PangoLayout *layout, 281pango_opengl_render_layout_subpixel (PangoLayout *layout,
282 rc_t *rc,
270 int x, int y, 283 int x, int y,
271 float r, float g, float b, float a, 284 float r, float g, float b, float a,
272 int flags) 285 int flags)
273{ 286{
274 PangoContext *context; 287 PangoContext *context;
275 PangoFontMap *fontmap; 288 PangoFontMap *fontmap;
276 PangoRenderer *renderer; 289 PangoRenderer *renderer;
290 PangoOpenGLRenderer *gl;
277 291
278 context = pango_layout_get_context (layout); 292 context = pango_layout_get_context (layout);
279 fontmap = pango_context_get_font_map (context); 293 fontmap = pango_context_get_font_map (context);
280 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));
281
282 PANGO_OPENGL_RENDERER (renderer)->r = r; 295 gl = PANGO_OPENGL_RENDERER (renderer);
283 PANGO_OPENGL_RENDERER (renderer)->g = g; 296
284 PANGO_OPENGL_RENDERER (renderer)->b = b; 297 gl->rc = rc;
285 PANGO_OPENGL_RENDERER (renderer)->a = a; 298 gl->r = r;
286 PANGO_OPENGL_RENDERER (renderer)->flags = flags; 299 gl->g = g;
300 gl->b = b;
301 gl->a = a;
302 gl->flags = flags;
287 303
288 pango_renderer_draw_layout (renderer, layout, x, y); 304 pango_renderer_draw_layout (renderer, layout, x, y);
289} 305}
290 306
291void 307void
292pango_opengl_render_layout (PangoLayout *layout, 308pango_opengl_render_layout (PangoLayout *layout,
309 rc_t *rc,
293 int x, int y, 310 int x, int y,
294 float r, float g, float b, float a, 311 float r, float g, float b, float a,
295 int flags) 312 int flags)
296{ 313{
297 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 );
298} 317}
299 318
300static void 319static void
301pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 320pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
302{ 321{
322 memset (&renderer->key, 0, sizeof (rc_key_t));
323
303 renderer->r = 1.; 324 renderer->r = 1.;
304 renderer->g = 1.; 325 renderer->g = 1.;
305 renderer->b = 1.; 326 renderer->b = 1.;
306 renderer->a = 1.; 327 renderer->a = 1.;
307} 328}
308 329
309static void 330static void
310prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 331prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
311{ 332{
312 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 333 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
313 PangoColor *fg = 0; 334 PangoColor *fg = 0;
314 GSList *l; 335 GSList *l;
315 unsigned char r, g, b, a; 336 unsigned char r, g, b, a;
316 337
317 renderer->underline = PANGO_UNDERLINE_NONE; 338 renderer->underline = PANGO_UNDERLINE_NONE;
318 renderer->strikethrough = FALSE; 339 renderer->strikethrough = FALSE;
340
341 gl->key.mode = GL_QUADS;
342 gl->key.format = 0; // glyphs
343 gl->key.texname = 0;
319 344
320 for (l = run->item->analysis.extra_attrs; l; l = l->next) 345 for (l = run->item->analysis.extra_attrs; l; l = l->next)
321 { 346 {
322 PangoAttribute *attr = l->data; 347 PangoAttribute *attr = l->data;
323 348
… …
346 g = fg->green * (255.f / 65535.f); 371 g = fg->green * (255.f / 65535.f);
347 b = fg->blue * (255.f / 65535.f); 372 b = fg->blue * (255.f / 65535.f);
348 } 373 }
349 else 374 else
350 { 375 {
351 r = glrenderer->r * 255.f; 376 r = gl->r * 255.f;
352 g = glrenderer->g * 255.f; 377 g = gl->g * 255.f;
353 b = glrenderer->b * 255.f; 378 b = gl->b * 255.f;
354 } 379 }
355 380
356 a = glrenderer->a * 255.f; 381 a = gl->a * 255.f;
357 382
358 if (glrenderer->flags & FLAG_INVERSE) 383 if (gl->flags & FLAG_INVERSE)
359 { 384 {
360 r ^= 0xffU; 385 r ^= 0xffU;
361 g ^= 0xffU; 386 g ^= 0xffU;
362 b ^= 0xffU; 387 b ^= 0xffU;
363 } 388 }
364 389
365 glColor4ub (r, g, b, a); 390 gl->key.r = r;
391 gl->key.g = g;
392 gl->key.b = b;
393 gl->key.a = a;
366} 394}
367 395
368static void 396static void
369draw_begin (PangoRenderer *renderer_) 397draw_begin (PangoRenderer *renderer_)
370{ 398{
371 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 399 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
372
373 renderer->curtex = 0;
374
375 glEnable (GL_TEXTURE_2D);
376 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
377 glEnable (GL_BLEND);
378 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
379 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
380 glEnable (GL_ALPHA_TEST);
381 glAlphaFunc (GL_GREATER, 0.01f);
382} 400}
383 401
384static void 402static void
385draw_end (PangoRenderer *renderer_) 403draw_end (PangoRenderer *renderer_)
386{ 404{
387 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 405 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
388
389 if (renderer->curtex)
390 glEnd ();
391
392 glDisable (GL_ALPHA_TEST);
393 glDisable (GL_BLEND);
394 glDisable (GL_TEXTURE_2D);
395} 406}
396 407
397static void 408static void
398pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 409pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
399{ 410{

Diff Legend

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