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.17 by root, Sun Nov 29 14:45:12 2009 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
… …
175 glBindTexture (GL_TEXTURE_2D, name); 175 glBindTexture (GL_TEXTURE_2D, name);
176 176
177 if (!apple_nvidia_bug_workaround) 177 if (!apple_nvidia_bug_workaround)
178 { 178 {
179 glPixelStorei (GL_UNPACK_ROW_LENGTH, stride); 179 glPixelStorei (GL_UNPACK_ROW_LENGTH, stride);
180 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 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); 181 glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm);
182 /*glPixelStorei (GL_UNPACK_ALIGNMENT, 4);*/
182 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); 183 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
183 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
184 } 184 }
185 else 185 else
186 { 186 {
187 /* starting with 10.5.5 (or 10.5.6), pple's nvidia driver corrupts textures */ 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, */ 188 /* when glTexSubImage is used, so do it the horribly slow way, */
… …
210 210
211 if (glyph == PANGO_GLYPH_EMPTY) 211 if (glyph == PANGO_GLYPH_EMPTY)
212 glyph = PANGO_GLYPH_UNKNOWN_FLAG; 212 glyph = PANGO_GLYPH_UNKNOWN_FLAG;
213 } 213 }
214 214
215 g = _pango_opengl_font_get_cache_glyph_data (font, glyph); 215 g = (glyph_info *)_pango_opengl_font_get_cache_glyph_data (font, glyph);
216 216
217 if (!g || g->generation != tc_generation) 217 if (!g || g->generation != tc_generation)
218 { 218 {
219 Glyph bm; 219 Glyph bm;
220 font_render_glyph (&bm, font, glyph); 220 font_render_glyph (&bm, font, glyph);
… …
242 y -= g->top; 242 y -= g->top;
243 243
244 if (g->tex.name != renderer->key.texname) 244 if (g->tex.name != renderer->key.texname)
245 { 245 {
246 renderer->key.texname = g->tex.name; 246 renderer->key.texname = g->tex.name;
247 renderer->arr = rc_array (renderer->rc, &renderer->key); 247 renderer->arr = &renderer->rc->array (renderer->key);
248 } 248 }
249 249
250 rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y); 250 renderer->arr->glyph (g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
251} 251}
252 252
253static void 253static void
254draw_trapezoid (PangoRenderer *renderer_, 254draw_trapezoid (PangoRenderer *renderer_,
255 PangoRenderPart part, 255 PangoRenderPart part,
… …
260 double x12, 260 double x12,
261 double x22) 261 double x22)
262{ 262{
263 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 263 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
264 rc_key_t key = renderer->key; 264 rc_key_t key = renderer->key;
265 rc_array_t *arr;
266 265
267 key.mode = GL_QUADS; 266 key.mode = GL_QUADS;
268 key.format = GL_V2F; 267 key.format = GL_V2F;
269 key.texname = 0; 268 key.texname = 0;
270 269
271 arr = rc_array (renderer->rc, &key); 270 auto &arr = renderer->rc->array (key);
272 271
273 rc_v2f (arr, x11, y1); 272 arr.v2f (x11, y1);
274 rc_v2f (arr, x21, y1); 273 arr.v2f (x21, y1);
275 rc_v2f (arr, x22, y2); 274 arr.v2f (x22, y2);
276 rc_v2f (arr, x12, y2); 275 arr.v2f (x12, y2);
277} 276}
278 277
279void 278void
280pango_opengl_render_layout_subpixel (PangoLayout *layout, 279pango_opengl_render_layout_subpixel (PangoLayout *layout,
281 rc_t *rc, 280 rc_t *rc,
282 int x, int y, 281 int x, int y,
283 float r, float g, float b, float a, 282 float r, float g, float b, float a,
284 int flags) 283 int flags)
… …
291 context = pango_layout_get_context (layout); 290 context = pango_layout_get_context (layout);
292 fontmap = pango_context_get_font_map (context); 291 fontmap = pango_context_get_font_map (context);
293 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));
294 gl = PANGO_OPENGL_RENDERER (renderer); 293 gl = PANGO_OPENGL_RENDERER (renderer);
295 294
296 gl->rc = rc; 295 gl->rc = rc;
297 gl->r = r; 296 gl->r = r;
298 gl->g = g; 297 gl->g = g;
299 gl->b = b; 298 gl->b = b;
300 gl->a = a; 299 gl->a = a;
301 gl->flags = flags; 300 gl->flags = flags;
302 301
303 pango_renderer_draw_layout (renderer, layout, x, y); 302 pango_renderer_draw_layout (renderer, layout, x, y);
304} 303}
305 304
306void 305void
307pango_opengl_render_layout (PangoLayout *layout, 306pango_opengl_render_layout (PangoLayout *layout,
308 rc_t *rc, 307 rc_t *rc,
309 int x, int y, 308 int x, int y,
310 float r, float g, float b, float a, 309 float r, float g, float b, float a,
311 int flags) 310 int flags)
… …
341 gl->key.format = 0; // glyphs 340 gl->key.format = 0; // glyphs
342 gl->key.texname = 0; 341 gl->key.texname = 0;
343 342
344 for (l = run->item->analysis.extra_attrs; l; l = l->next) 343 for (l = run->item->analysis.extra_attrs; l; l = l->next)
345 { 344 {
346 PangoAttribute *attr = l->data; 345 PangoAttribute *attr = (PangoAttribute *)l->data;
347 346
348 switch (attr->klass->type) 347 switch (attr->klass->type)
349 { 348 {
350 case PANGO_ATTR_UNDERLINE: 349 case PANGO_ATTR_UNDERLINE:
351 renderer->underline = ((PangoAttrInt *)attr)->value; 350 renderer->underline = (PangoUnderline)((PangoAttrInt *)attr)->value;
352 break; 351 break;
353 352
354 case PANGO_ATTR_STRIKETHROUGH: 353 case PANGO_ATTR_STRIKETHROUGH:
355 renderer->strikethrough = ((PangoAttrInt *)attr)->value; 354 renderer->strikethrough = ((PangoAttrInt *)attr)->value;
356 break; 355 break;
… …
368 { 367 {
369 r = fg->red * (255.f / 65535.f); 368 r = fg->red * (255.f / 65535.f);
370 g = fg->green * (255.f / 65535.f); 369 g = fg->green * (255.f / 65535.f);
371 b = fg->blue * (255.f / 65535.f); 370 b = fg->blue * (255.f / 65535.f);
372 } 371 }
373 else 372 else
374 { 373 {
375 r = gl->r * 255.f; 374 r = gl->r * 255.f;
376 g = gl->g * 255.f; 375 g = gl->g * 255.f;
377 b = gl->b * 255.f; 376 b = gl->b * 255.f;
378 } 377 }

Diff Legend

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