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.20 by root, Sun Nov 18 03:06:13 2018 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_t::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
… …
58 if (size > alloc) 60 if (size > alloc)
59 { 61 {
60 size = (size + 4095) & ~4095; 62 size = (size + 4095) & ~4095;
61 free (buffer); 63 free (buffer);
62 alloc = size; 64 alloc = size;
63 buffer = malloc (size); 65 buffer = (char *)malloc (size);
64 } 66 }
65 67
66 return buffer; 68 return buffer;
67} 69}
68 70
… …
88 glyph->width = width; 90 glyph->width = width;
89 glyph->height = height; 91 glyph->height = height;
90 glyph->top = top; 92 glyph->top = top;
91 glyph->left = left; 93 glyph->left = left;
92 94
93 glyph->bitmap = temp_buffer (width * height); 95 glyph->bitmap = (uint8_t *)temp_buffer (width * height);
94 memset (glyph->bitmap, 0, glyph->stride * height); 96 memset (glyph->bitmap, 0, glyph->stride * height);
95 97
96 for (i = width; i--; ) 98 for (i = width; i--; )
97 glyph->bitmap [i] = glyph->bitmap [i + (height - 1) * glyph->stride] = 0xff; 99 glyph->bitmap [i] = glyph->bitmap [i + (height - 1) * glyph->stride] = 0xff;
98 100
… …
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 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
162static void 201static void
163draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 202draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
164{ 203{
165 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 204 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
166 glyph_info *g; 205 glyph_info *g;
167 float x1, y1, x2, y2;
168 206
169 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 207 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
170 { 208 {
171 glyph = pango_opengl_get_unknown_glyph (font); 209 glyph = pango_opengl_get_unknown_glyph (font);
172 210
173 if (glyph == PANGO_GLYPH_EMPTY) 211 if (glyph == PANGO_GLYPH_EMPTY)
174 glyph = PANGO_GLYPH_UNKNOWN_FLAG; 212 glyph = PANGO_GLYPH_UNKNOWN_FLAG;
175 } 213 }
176 214
177 g = _pango_opengl_font_get_cache_glyph_data (font, glyph); 215 g = (glyph_info *)_pango_opengl_font_get_cache_glyph_data (font, glyph);
178 216
179 if (!g || g->generation != tc_generation) 217 if (!g || g->generation != tc_generation)
180 { 218 {
181 Glyph bm; 219 Glyph bm;
182 font_render_glyph (&bm, font, glyph); 220 font_render_glyph (&bm, font, glyph);
183 221
184 if (g) 222 if (!g)
185 g->generation = tc_generation;
186 else
187 { 223 {
188 g = g_slice_new (glyph_info); 224 g = g_slice_new (glyph_info);
189 225
190 _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);
191 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 227 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
192 } 228 }
193 229
194 if (renderer->curtex) 230 g->generation = tc_generation;
195 glEnd ();
196
197 tc_get (&g->tex, bm.width, bm.height);
198 231
199 g->left = bm.left; 232 g->left = bm.left;
200 g->top = bm.top; 233 g->top = bm.top;
201 234
202 glBindTexture (GL_TEXTURE_2D, g->tex.name); 235 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 236
209 renderer->curtex = g->tex.name; 237 if (bm.width && bm.height)
210 glBegin (GL_QUADS); 238 tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
211 } 239 }
212 240
213 x += g->left; 241 x += g->left;
214 y -= g->top; 242 y -= g->top;
215 243
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) 244 if (g->tex.name != renderer->key.texname)
222 { 245 {
223 if (renderer->curtex)
224 glEnd ();
225
226 glBindTexture (GL_TEXTURE_2D, g->tex.name);
227 renderer->curtex = g->tex.name; 246 renderer->key.texname = g->tex.name;
228 247 renderer->arr = &renderer->rc->array (renderer->key);
229 glBegin (GL_QUADS);
230 } 248 }
231 249
232 glTexCoord2f (x1, y1); glVertex2i (x , y ); 250 renderer->arr->glyph (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} 251}
237 252
238static void 253static void
239draw_trapezoid (PangoRenderer *renderer_, 254draw_trapezoid (PangoRenderer *renderer_,
240 PangoRenderPart part, 255 PangoRenderPart part,
… …
244 double y2, 259 double y2,
245 double x12, 260 double x12,
246 double x22) 261 double x22)
247{ 262{
248 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 263 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
264 rc_key_t key = renderer->key;
249 265
250 if (renderer->curtex) 266 key.mode = GL_QUADS;
251 { 267 key.format = GL_V2F;
252 glEnd (); 268 key.texname = 0;
253 renderer->curtex = 0;
254 }
255 269
256 glDisable (GL_TEXTURE_2D); 270 auto &arr = renderer->rc->array (key);
257 271
258 glBegin (GL_QUADS); 272 arr.v2f (x11, y1);
259 glVertex2d (x11, y1); 273 arr.v2f (x21, y1);
260 glVertex2d (x21, y1); 274 arr.v2f (x22, y2);
261 glVertex2d (x22, y2); 275 arr.v2f (x12, y2);
262 glVertex2d (x12, y2);
263 glEnd ();
264
265 glEnable (GL_TEXTURE_2D);
266} 276}
267 277
268void 278void
269pango_opengl_render_layout_subpixel (PangoLayout *layout, 279pango_opengl_render_layout_subpixel (PangoLayout *layout,
280 rc_t *rc,
270 int x, int y, 281 int x, int y,
271 float r, float g, float b, float a, 282 float r, float g, float b, float a,
272 int flags) 283 int flags)
273{ 284{
274 PangoContext *context; 285 PangoContext *context;
275 PangoFontMap *fontmap; 286 PangoFontMap *fontmap;
276 PangoRenderer *renderer; 287 PangoRenderer *renderer;
288 PangoOpenGLRenderer *gl;
277 289
278 context = pango_layout_get_context (layout); 290 context = pango_layout_get_context (layout);
279 fontmap = pango_context_get_font_map (context); 291 fontmap = pango_context_get_font_map (context);
280 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));
281
282 PANGO_OPENGL_RENDERER (renderer)->r = r; 293 gl = PANGO_OPENGL_RENDERER (renderer);
283 PANGO_OPENGL_RENDERER (renderer)->g = g; 294
284 PANGO_OPENGL_RENDERER (renderer)->b = b; 295 gl->rc = rc;
285 PANGO_OPENGL_RENDERER (renderer)->a = a; 296 gl->r = r;
286 PANGO_OPENGL_RENDERER (renderer)->flags = flags; 297 gl->g = g;
298 gl->b = b;
299 gl->a = a;
300 gl->flags = flags;
287 301
288 pango_renderer_draw_layout (renderer, layout, x, y); 302 pango_renderer_draw_layout (renderer, layout, x, y);
289} 303}
290 304
291void 305void
292pango_opengl_render_layout (PangoLayout *layout, 306pango_opengl_render_layout (PangoLayout *layout,
307 rc_t *rc,
293 int x, int y, 308 int x, int y,
294 float r, float g, float b, float a, 309 float r, float g, float b, float a,
295 int flags) 310 int flags)
296{ 311{
297 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 );
298} 315}
299 316
300static void 317static void
301pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 318pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
302{ 319{
320 memset (&renderer->key, 0, sizeof (rc_key_t));
321
303 renderer->r = 1.; 322 renderer->r = 1.;
304 renderer->g = 1.; 323 renderer->g = 1.;
305 renderer->b = 1.; 324 renderer->b = 1.;
306 renderer->a = 1.; 325 renderer->a = 1.;
307} 326}
308 327
309static void 328static void
310prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 329prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
311{ 330{
312 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 331 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
313 PangoColor *fg = 0; 332 PangoColor *fg = 0;
314 GSList *l; 333 GSList *l;
315 unsigned char r, g, b, a; 334 unsigned char r, g, b, a;
316 335
317 renderer->underline = PANGO_UNDERLINE_NONE; 336 renderer->underline = PANGO_UNDERLINE_NONE;
318 renderer->strikethrough = FALSE; 337 renderer->strikethrough = FALSE;
319 338
339 gl->key.mode = GL_QUADS;
340 gl->key.format = 0; // glyphs
341 gl->key.texname = 0;
342
320 for (l = run->item->analysis.extra_attrs; l; l = l->next) 343 for (l = run->item->analysis.extra_attrs; l; l = l->next)
321 { 344 {
322 PangoAttribute *attr = l->data; 345 PangoAttribute *attr = (PangoAttribute *)l->data;
323 346
324 switch (attr->klass->type) 347 switch (attr->klass->type)
325 { 348 {
326 case PANGO_ATTR_UNDERLINE: 349 case PANGO_ATTR_UNDERLINE:
327 renderer->underline = ((PangoAttrInt *)attr)->value; 350 renderer->underline = (PangoUnderline)((PangoAttrInt *)attr)->value;
328 break; 351 break;
329 352
330 case PANGO_ATTR_STRIKETHROUGH: 353 case PANGO_ATTR_STRIKETHROUGH:
331 renderer->strikethrough = ((PangoAttrInt *)attr)->value; 354 renderer->strikethrough = ((PangoAttrInt *)attr)->value;
332 break; 355 break;
… …
344 { 367 {
345 r = fg->red * (255.f / 65535.f); 368 r = fg->red * (255.f / 65535.f);
346 g = fg->green * (255.f / 65535.f); 369 g = fg->green * (255.f / 65535.f);
347 b = fg->blue * (255.f / 65535.f); 370 b = fg->blue * (255.f / 65535.f);
348 } 371 }
349 else 372 else
350 { 373 {
351 r = glrenderer->r * 255.f; 374 r = gl->r * 255.f;
352 g = glrenderer->g * 255.f; 375 g = gl->g * 255.f;
353 b = glrenderer->b * 255.f; 376 b = gl->b * 255.f;
354 } 377 }
355 378
356 a = glrenderer->a * 255.f; 379 a = gl->a * 255.f;
357 380
358 if (glrenderer->flags & FLAG_INVERSE) 381 if (gl->flags & FLAG_INVERSE)
359 { 382 {
360 r ^= 0xffU; 383 r ^= 0xffU;
361 g ^= 0xffU; 384 g ^= 0xffU;
362 b ^= 0xffU; 385 b ^= 0xffU;
363 } 386 }
364 387
365 glColor4ub (r, g, b, a); 388 gl->key.r = r;
389 gl->key.g = g;
390 gl->key.b = b;
391 gl->key.a = a;
366} 392}
367 393
368static void 394static void
369draw_begin (PangoRenderer *renderer_) 395draw_begin (PangoRenderer *renderer_)
370{ 396{
371 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 397 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} 398}
383 399
384static void 400static void
385draw_end (PangoRenderer *renderer_) 401draw_end (PangoRenderer *renderer_)
386{ 402{
387 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 403 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} 404}
396 405
397static void 406static void
398pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 407pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
399{ 408{

Diff Legend

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