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.1 by root, Tue Jul 4 23:23:32 2006 UTC vs.
Revision 1.20 by root, Sun Nov 18 03:06:13 2018 UTC

… …
35 35
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 GLuint curtex; // current texture 40 int flags;
41 rc_t *rc; // rendercache
42 rc_key_t key; // current render key
43 rc_t::array_t *arr;
41}; 44};
42 45
43G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER) 46G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER)
44 47
45typedef struct 48typedef struct
… …
57 if (size > alloc) 60 if (size > alloc)
58 { 61 {
59 size = (size + 4095) & ~4095; 62 size = (size + 4095) & ~4095;
60 free (buffer); 63 free (buffer);
61 alloc = size; 64 alloc = size;
62 buffer = malloc (size); 65 buffer = (char *)malloc (size);
63 } 66 }
64 67
65 return buffer; 68 return buffer;
66} 69}
67 70
… …
87 glyph->width = width; 90 glyph->width = width;
88 glyph->height = height; 91 glyph->height = height;
89 glyph->top = top; 92 glyph->top = top;
90 glyph->left = left; 93 glyph->left = left;
91 94
92 glyph->bitmap = temp_buffer (width * height); 95 glyph->bitmap = (uint8_t *)temp_buffer (width * height);
93 memset (glyph->bitmap, 0, glyph->stride * height); 96 memset (glyph->bitmap, 0, glyph->stride * height);
94 97
95 for (i = width; i--; ) 98 for (i = width; i--; )
96 glyph->bitmap [i] = glyph->bitmap [i + (height - 1) * glyph->stride] = 0xff; 99 glyph->bitmap [i] = glyph->bitmap [i + (height - 1) * glyph->stride] = 0xff;
97 100
… …
100} 103}
101 104
102static void 105static void
103font_render_glyph (Glyph *glyph, PangoFont *font, int glyph_index) 106font_render_glyph (Glyph *glyph, PangoFont *font, int glyph_index)
104{ 107{
108 FT_Face face;
109
105 if (glyph_index & PANGO_GLYPH_UNKNOWN_FLAG) 110 if (glyph_index & PANGO_GLYPH_UNKNOWN_FLAG)
106 { 111 {
107 PangoFontMetrics *metrics; 112 PangoFontMetrics *metrics;
108 113
109 if (!font) 114 if (!font)
… …
120 pango_font_metrics_unref (metrics); 125 pango_font_metrics_unref (metrics);
121 126
122 return; 127 return;
123 } 128 }
124 129
125 FT_Face face = pango_opengl_font_get_face (font); 130 face = pango_opengl_font_get_face (font);
126 131
127 if (face) 132 if (face)
128 { 133 {
129 PangoOpenGLFont *glfont = (PangoOpenGLFont *)font; 134 PangoOpenGLFont *glfont = (PangoOpenGLFont *)font;
130 135
… …
144} 149}
145 150
146typedef struct glyph_info { 151typedef struct glyph_info {
147 tc_area tex; 152 tc_area tex;
148 int left, top; 153 int left, top;
154 int generation;
149} glyph_info; 155} glyph_info;
150 156
151static void 157static void
152free_glyph_info (glyph_info *g) 158free_glyph_info (glyph_info *g)
153{ 159{
154 tc_put (&g->tex); 160 tc_put (&g->tex);
155 g_slice_free (glyph_info, g); 161 g_slice_free (glyph_info, g);
156} 162}
157 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
158static void 201static void
159draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 202draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
160{ 203{
161 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 204 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
205 glyph_info *g;
162 206
163 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 207 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
164 { 208 {
165 glyph = pango_opengl_get_unknown_glyph (font); 209 glyph = pango_opengl_get_unknown_glyph (font);
166 210
167 if (glyph == PANGO_GLYPH_EMPTY) 211 if (glyph == PANGO_GLYPH_EMPTY)
168 glyph = PANGO_GLYPH_UNKNOWN_FLAG; 212 glyph = PANGO_GLYPH_UNKNOWN_FLAG;
169 } 213 }
170 214
171 glyph_info *g = _pango_opengl_font_get_cache_glyph_data (font, glyph); 215 g = (glyph_info *)_pango_opengl_font_get_cache_glyph_data (font, glyph);
172 216
173 if (!g) 217 if (!g || g->generation != tc_generation)
174 { 218 {
175 Glyph bm; 219 Glyph bm;
176 font_render_glyph (&bm, font, glyph); 220 font_render_glyph (&bm, font, glyph);
177 221
222 if (!g)
223 {
178 g = g_slice_new (glyph_info); 224 g = g_slice_new (glyph_info);
179 225
180 tc_get (&g->tex, bm.width, bm.height); 226 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
227 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
228 }
229
230 g->generation = tc_generation;
181 231
182 g->left = bm.left; 232 g->left = bm.left;
183 g->top = bm.top; 233 g->top = bm.top;
184 234
185 if (renderer->curtex) 235 tc_get (&g->tex, bm.width, bm.height);
186 {
187 glEnd ();
188 renderer->curtex = 0;
189 }
190 236
191 glBindTexture (GL_TEXTURE_2D, g->tex.name); 237 if (bm.width && bm.height)
192 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 238 tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
193 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
194 glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
195 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
196 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
197
198 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
199 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
200 } 239 }
201 240
202 x += g->left; 241 x += g->left;
203 y -= g->top; 242 y -= g->top;
204 243
205 float x1 = g->tex.x * (1. / TC_WIDTH );
206 float y1 = g->tex.y * (1. / TC_HEIGHT);
207 float x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
208 float y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
209
210 if (g->tex.name != renderer->curtex) 244 if (g->tex.name != renderer->key.texname)
211 { 245 {
212 if (renderer->curtex)
213 glEnd ();
214
215 glBindTexture (GL_TEXTURE_2D, g->tex.name);
216 renderer->curtex = g->tex.name; 246 renderer->key.texname = g->tex.name;
217 glBegin (GL_QUADS); 247 renderer->arr = &renderer->rc->array (renderer->key);
218 } 248 }
219 249
220 glTexCoord2f (x1, y1); glVertex2i (x , y ); 250 renderer->arr->glyph (g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
221 glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
222 glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
223 glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
224} 251}
225 252
226static void 253static void
227draw_trapezoid (PangoRenderer *renderer_, 254draw_trapezoid (PangoRenderer *renderer_,
228 PangoRenderPart part, 255 PangoRenderPart part,
… …
232 double y2, 259 double y2,
233 double x12, 260 double x12,
234 double x22) 261 double x22)
235{ 262{
236 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 263 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
264 rc_key_t key = renderer->key;
237 265
238 if (renderer->curtex) 266 key.mode = GL_QUADS;
239 { 267 key.format = GL_V2F;
240 glEnd (); 268 key.texname = 0;
241 renderer->curtex = 0;
242 }
243 269
244 glDisable (GL_TEXTURE_2D); 270 auto &arr = renderer->rc->array (key);
245 271
246 glBegin (GL_QUADS); 272 arr.v2f (x11, y1);
247 glVertex2d (x11, y1); 273 arr.v2f (x21, y1);
248 glVertex2d (x12, y1); 274 arr.v2f (x22, y2);
249 glVertex2d (x22, y2); 275 arr.v2f (x12, y2);
250 glVertex2d (x21, y2);
251 glEnd ();
252
253 glEnable (GL_TEXTURE_2D);
254} 276}
255 277
256void 278void
257pango_opengl_render_layout_subpixel (PangoLayout *layout, 279pango_opengl_render_layout_subpixel (PangoLayout *layout,
280 rc_t *rc,
258 int x, int y, 281 int x, int y,
259 float r, float g, float b, float a) 282 float r, float g, float b, float a,
283 int flags)
260{ 284{
261 PangoContext *context; 285 PangoContext *context;
262 PangoFontMap *fontmap; 286 PangoFontMap *fontmap;
263 PangoRenderer *renderer; 287 PangoRenderer *renderer;
288 PangoOpenGLRenderer *gl;
264 289
265 context = pango_layout_get_context (layout); 290 context = pango_layout_get_context (layout);
266 fontmap = pango_context_get_font_map (context); 291 fontmap = pango_context_get_font_map (context);
267 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 292 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
268
269 PANGO_OPENGL_RENDERER (renderer)->r = r; 293 gl = PANGO_OPENGL_RENDERER (renderer);
270 PANGO_OPENGL_RENDERER (renderer)->g = g; 294
271 PANGO_OPENGL_RENDERER (renderer)->b = b; 295 gl->rc = rc;
272 PANGO_OPENGL_RENDERER (renderer)->a = a; 296 gl->r = r;
297 gl->g = g;
298 gl->b = b;
299 gl->a = a;
300 gl->flags = flags;
273 301
274 pango_renderer_draw_layout (renderer, layout, x, y); 302 pango_renderer_draw_layout (renderer, layout, x, y);
275} 303}
276 304
277void 305void
278pango_opengl_render_layout (PangoLayout *layout, 306pango_opengl_render_layout (PangoLayout *layout,
307 rc_t *rc,
279 int x, int y, 308 int x, int y,
280 float r, float g, float b, float a) 309 float r, float g, float b, float a,
310 int flags)
281{ 311{
282 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a); 312 pango_opengl_render_layout_subpixel (
313 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
314 );
283} 315}
284 316
285static void 317static void
286pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 318pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
287{ 319{
320 memset (&renderer->key, 0, sizeof (rc_key_t));
321
288 renderer->r = 1.; 322 renderer->r = 1.;
289 renderer->g = 1.; 323 renderer->g = 1.;
290 renderer->b = 1.; 324 renderer->b = 1.;
291 renderer->a = 1.; 325 renderer->a = 1.;
292} 326}
293 327
294static void 328static void
295prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 329prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
296{ 330{
297 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 331 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
298 PangoColor *fg = 0; 332 PangoColor *fg = 0;
299 GSList *l; 333 GSList *l;
334 unsigned char r, g, b, a;
300 335
301 renderer->underline = PANGO_UNDERLINE_NONE; 336 renderer->underline = PANGO_UNDERLINE_NONE;
302 renderer->strikethrough = FALSE; 337 renderer->strikethrough = FALSE;
303 338
339 gl->key.mode = GL_QUADS;
340 gl->key.format = 0; // glyphs
341 gl->key.texname = 0;
342
304 for (l = run->item->analysis.extra_attrs; l; l = l->next) 343 for (l = run->item->analysis.extra_attrs; l; l = l->next)
305 { 344 {
306 PangoAttribute *attr = l->data; 345 PangoAttribute *attr = (PangoAttribute *)l->data;
307 346
308 switch (attr->klass->type) 347 switch (attr->klass->type)
309 { 348 {
310 case PANGO_ATTR_UNDERLINE: 349 case PANGO_ATTR_UNDERLINE:
311 renderer->underline = ((PangoAttrInt *)attr)->value; 350 renderer->underline = (PangoUnderline)((PangoAttrInt *)attr)->value;
312 break; 351 break;
313 352
314 case PANGO_ATTR_STRIKETHROUGH: 353 case PANGO_ATTR_STRIKETHROUGH:
315 renderer->strikethrough = ((PangoAttrInt *)attr)->value; 354 renderer->strikethrough = ((PangoAttrInt *)attr)->value;
316 break; 355 break;
… …
323 break; 362 break;
324 } 363 }
325 } 364 }
326 365
327 if (fg) 366 if (fg)
328 glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a); 367 {
368 r = fg->red * (255.f / 65535.f);
369 g = fg->green * (255.f / 65535.f);
370 b = fg->blue * (255.f / 65535.f);
371 }
329 else 372 else
330 glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a); 373 {
374 r = gl->r * 255.f;
375 g = gl->g * 255.f;
376 b = gl->b * 255.f;
377 }
378
379 a = gl->a * 255.f;
380
381 if (gl->flags & FLAG_INVERSE)
382 {
383 r ^= 0xffU;
384 g ^= 0xffU;
385 b ^= 0xffU;
386 }
387
388 gl->key.r = r;
389 gl->key.g = g;
390 gl->key.b = b;
391 gl->key.a = a;
331} 392}
332 393
333static void 394static void
334draw_begin (PangoRenderer *renderer_) 395draw_begin (PangoRenderer *renderer_)
335{ 396{
336 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 397 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
337
338 renderer->curtex = 0;
339
340 glEnable (GL_TEXTURE_2D);
341 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
342 glEnable (GL_BLEND);
343 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
344 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
345 glEnable (GL_ALPHA_TEST);
346 glAlphaFunc (GL_GREATER, 0.01f);
347} 398}
348 399
349static void 400static void
350draw_end (PangoRenderer *renderer_) 401draw_end (PangoRenderer *renderer_)
351{ 402{
352 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 403 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
353
354 if (renderer->curtex)
355 glEnd ();
356
357 glDisable (GL_ALPHA_TEST);
358 glDisable (GL_BLEND);
359 glDisable (GL_TEXTURE_2D);
360} 404}
361 405
362static void 406static void
363pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 407pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
364{ 408{

Diff Legend

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