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.20 by root, Sun Nov 18 03:06:13 2018 UTC

… …
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 rc_t *rc; // rendercache 41 rc_t *rc; // rendercache
42 rc_key_t key; // current render key 42 rc_key_t key; // current render key
43 rc_array_t *arr; 43 rc_t::array_t *arr;
44}; 44};
45 45
46G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER) 46G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER)
47 47
48typedef struct 48typedef struct
… …
60 if (size > alloc) 60 if (size > alloc)
61 { 61 {
62 size = (size + 4095) & ~4095; 62 size = (size + 4095) & ~4095;
63 free (buffer); 63 free (buffer);
64 alloc = size; 64 alloc = size;
65 buffer = malloc (size); 65 buffer = (char *)malloc (size);
66 } 66 }
67 67
68 return buffer; 68 return buffer;
69} 69}
70 70
… …
90 glyph->width = width; 90 glyph->width = width;
91 glyph->height = height; 91 glyph->height = height;
92 glyph->top = top; 92 glyph->top = top;
93 glyph->left = left; 93 glyph->left = left;
94 94
95 glyph->bitmap = temp_buffer (width * height); 95 glyph->bitmap = (uint8_t *)temp_buffer (width * height);
96 memset (glyph->bitmap, 0, glyph->stride * height); 96 memset (glyph->bitmap, 0, glyph->stride * height);
97 97
98 for (i = width; i--; ) 98 for (i = width; i--; )
99 glyph->bitmap [i] = glyph->bitmap [i + (height - 1) * glyph->stride] = 0xff; 99 glyph->bitmap [i] = glyph->bitmap [i + (height - 1) * glyph->stride] = 0xff;
100 100
… …
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
175 if (glyph == PANGO_GLYPH_EMPTY) 211 if (glyph == PANGO_GLYPH_EMPTY)
176 glyph = PANGO_GLYPH_UNKNOWN_FLAG; 212 glyph = PANGO_GLYPH_UNKNOWN_FLAG;
177 } 213 }
178 214
179 g = _pango_opengl_font_get_cache_glyph_data (font, glyph); 215 g = (glyph_info *)_pango_opengl_font_get_cache_glyph_data (font, glyph);
180 216
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 = &renderer->rc->array (renderer->key);
221 } 248 }
222 249
223 rc_t2f_v3f (x1, y1, x , y , 0); 250 renderer->arr->glyph (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} 251}
228 252
229static void 253static void
230draw_trapezoid (PangoRenderer *renderer_, 254draw_trapezoid (PangoRenderer *renderer_,
231 PangoRenderPart part, 255 PangoRenderPart part,
… …
236 double x12, 260 double x12,
237 double x22) 261 double x22)
238{ 262{
239 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 263 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
240 rc_key_t key = renderer->key; 264 rc_key_t key = renderer->key;
241 rc_array_t *arr;
242 265
243 key.mode = GL_QUADS; 266 key.mode = GL_QUADS;
244 key.format = GL_V2F; 267 key.format = GL_V2F;
245 key.texname = 0; 268 key.texname = 0;
246 269
247 arr = rc_array (renderer->rc, &key); 270 auto &arr = renderer->rc->array (key);
248 271
249 rc_v2f (x11, y1); 272 arr.v2f (x11, y1);
250 rc_v2f (x21, y1); 273 arr.v2f (x21, y1);
251 rc_v2f (x22, y2); 274 arr.v2f (x22, y2);
252 rc_v2f (x12, y2); 275 arr.v2f (x12, y2);
253} 276}
254 277
255void 278void
256pango_opengl_render_layout_subpixel (PangoLayout *layout, 279pango_opengl_render_layout_subpixel (PangoLayout *layout,
280 rc_t *rc,
257 int x, int y, 281 int x, int y,
258 float r, float g, float b, float a, 282 float r, float g, float b, float a,
259 int flags) 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;
273 PANGO_OPENGL_RENDERER (renderer)->flags = flags; 297 gl->g = g;
298 gl->b = b;
299 gl->a = a;
300 gl->flags = flags;
274 301
275 pango_renderer_draw_layout (renderer, layout, x, y); 302 pango_renderer_draw_layout (renderer, layout, x, y);
276} 303}
277 304
278void 305void
279pango_opengl_render_layout (PangoLayout *layout, 306pango_opengl_render_layout (PangoLayout *layout,
307 rc_t *rc,
280 int x, int y, 308 int x, int y,
281 float r, float g, float b, float a, 309 float r, float g, float b, float a,
282 int flags) 310 int flags)
283{ 311{
284 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags); 312 pango_opengl_render_layout_subpixel (
313 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
314 );
285} 315}
286 316
287static void 317static void
288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 318pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
289{ 319{
… …
296} 326}
297 327
298static void 328static void
299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 329prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
300{ 330{
301 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 331 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
302 PangoColor *fg = 0; 332 PangoColor *fg = 0;
303 GSList *l; 333 GSList *l;
304 unsigned char r, g, b, a; 334 unsigned char r, g, b, a;
305 335
306 renderer->underline = PANGO_UNDERLINE_NONE; 336 renderer->underline = PANGO_UNDERLINE_NONE;
307 renderer->strikethrough = FALSE; 337 renderer->strikethrough = FALSE;
308 338
309 renderer->key.mode = GL_QUADS; 339 gl->key.mode = GL_QUADS;
310 renderer->key.format = GL_T2F_V2F; 340 gl->key.format = 0; // glyphs
311 renderer->key.texname = 0; 341 gl->key.texname = 0;
312 342
313 for (l = run->item->analysis.extra_attrs; l; l = l->next) 343 for (l = run->item->analysis.extra_attrs; l; l = l->next)
314 { 344 {
315 PangoAttribute *attr = l->data; 345 PangoAttribute *attr = (PangoAttribute *)l->data;
316 346
317 switch (attr->klass->type) 347 switch (attr->klass->type)
318 { 348 {
319 case PANGO_ATTR_UNDERLINE: 349 case PANGO_ATTR_UNDERLINE:
320 renderer->underline = ((PangoAttrInt *)attr)->value; 350 renderer->underline = (PangoUnderline)((PangoAttrInt *)attr)->value;
321 break; 351 break;
322 352
323 case PANGO_ATTR_STRIKETHROUGH: 353 case PANGO_ATTR_STRIKETHROUGH:
324 renderer->strikethrough = ((PangoAttrInt *)attr)->value; 354 renderer->strikethrough = ((PangoAttrInt *)attr)->value;
325 break; 355 break;
… …
337 { 367 {
338 r = fg->red * (255.f / 65535.f); 368 r = fg->red * (255.f / 65535.f);
339 g = fg->green * (255.f / 65535.f); 369 g = fg->green * (255.f / 65535.f);
340 b = fg->blue * (255.f / 65535.f); 370 b = fg->blue * (255.f / 65535.f);
341 } 371 }
342 else 372 else
343 { 373 {
344 r = glrenderer->r * 255.f; 374 r = gl->r * 255.f;
345 g = glrenderer->g * 255.f; 375 g = gl->g * 255.f;
346 b = glrenderer->b * 255.f; 376 b = gl->b * 255.f;
347 } 377 }
348 378
349 a = glrenderer->a * 255.f; 379 a = gl->a * 255.f;
350 380
351 if (glrenderer->flags & FLAG_INVERSE) 381 if (gl->flags & FLAG_INVERSE)
352 { 382 {
353 r ^= 0xffU; 383 r ^= 0xffU;
354 g ^= 0xffU; 384 g ^= 0xffU;
355 b ^= 0xffU; 385 b ^= 0xffU;
356 } 386 }
357 387
358 renderer->key.r = r; 388 gl->key.r = r;
359 renderer->key.g = g; 389 gl->key.g = g;
360 renderer->key.b = b; 390 gl->key.b = b;
361 renderer->key.a = a; 391 gl->key.a = a;
362} 392}
363 393
364static void 394static void
365draw_begin (PangoRenderer *renderer_) 395draw_begin (PangoRenderer *renderer_)
366{ 396{
367 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 397 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} 398}
377 399
378static void 400static void
379draw_end (PangoRenderer *renderer_) 401draw_end (PangoRenderer *renderer_)
380{ 402{
381 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 403 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} 404}
389 405
390static void 406static void
391pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 407pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
392{ 408{

Diff Legend

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