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.2 by root, Tue Jul 4 23:44:23 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
… …
146} 149}
147 150
148typedef struct glyph_info { 151typedef struct glyph_info {
149 tc_area tex; 152 tc_area tex;
150 int left, top; 153 int left, top;
154 int generation;
151} glyph_info; 155} glyph_info;
152 156
153static void 157static void
154free_glyph_info (glyph_info *g) 158free_glyph_info (glyph_info *g)
155{ 159{
156 tc_put (&g->tex); 160 tc_put (&g->tex);
157 g_slice_free (glyph_info, g); 161 g_slice_free (glyph_info, g);
158} 162}
159 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
160static void 201static void
161draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 202draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
162{ 203{
163 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 204 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
164 glyph_info *g; 205 glyph_info *g;
165 float x1, y1, x2, y2;
166 206
167 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 207 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
168 { 208 {
169 glyph = pango_opengl_get_unknown_glyph (font); 209 glyph = pango_opengl_get_unknown_glyph (font);
170 210
171 if (glyph == PANGO_GLYPH_EMPTY) 211 if (glyph == PANGO_GLYPH_EMPTY)
172 glyph = PANGO_GLYPH_UNKNOWN_FLAG; 212 glyph = PANGO_GLYPH_UNKNOWN_FLAG;
173 } 213 }
174 214
175 g = _pango_opengl_font_get_cache_glyph_data (font, glyph); 215 g = (glyph_info *)_pango_opengl_font_get_cache_glyph_data (font, glyph);
176 216
177 if (!g) 217 if (!g || g->generation != tc_generation)
178 { 218 {
179 Glyph bm; 219 Glyph bm;
180 font_render_glyph (&bm, font, glyph); 220 font_render_glyph (&bm, font, glyph);
181 221
222 if (!g)
223 {
182 g = g_slice_new (glyph_info); 224 g = g_slice_new (glyph_info);
183 225
184 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;
185 231
186 g->left = bm.left; 232 g->left = bm.left;
187 g->top = bm.top; 233 g->top = bm.top;
188 234
189 if (renderer->curtex) 235 tc_get (&g->tex, bm.width, bm.height);
190 {
191 glEnd ();
192 renderer->curtex = 0;
193 }
194 236
195 glBindTexture (GL_TEXTURE_2D, g->tex.name); 237 if (bm.width && bm.height)
196 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);
197 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
198 glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
199 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
200 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
201
202 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
203 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
204 } 239 }
205 240
206 x += g->left; 241 x += g->left;
207 y -= g->top; 242 y -= g->top;
208 243
209 x1 = g->tex.x * (1. / TC_WIDTH );
210 y1 = g->tex.y * (1. / TC_HEIGHT);
211 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
212 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
213
214 if (g->tex.name != renderer->curtex) 244 if (g->tex.name != renderer->key.texname)
215 { 245 {
216 if (renderer->curtex)
217 glEnd ();
218
219 glBindTexture (GL_TEXTURE_2D, g->tex.name);
220 renderer->curtex = g->tex.name; 246 renderer->key.texname = g->tex.name;
221 glBegin (GL_QUADS); 247 renderer->arr = &renderer->rc->array (renderer->key);
222 } 248 }
223 249
224 glTexCoord2f (x1, y1); glVertex2i (x , y ); 250 renderer->arr->glyph (g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
225 glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
226 glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
227 glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
228} 251}
229 252
230static void 253static void
231draw_trapezoid (PangoRenderer *renderer_, 254draw_trapezoid (PangoRenderer *renderer_,
232 PangoRenderPart part, 255 PangoRenderPart part,
… …
236 double y2, 259 double y2,
237 double x12, 260 double x12,
238 double x22) 261 double x22)
239{ 262{
240 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 263 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
264 rc_key_t key = renderer->key;
241 265
242 if (renderer->curtex) 266 key.mode = GL_QUADS;
243 { 267 key.format = GL_V2F;
244 glEnd (); 268 key.texname = 0;
245 renderer->curtex = 0;
246 }
247 269
248 glDisable (GL_TEXTURE_2D); 270 auto &arr = renderer->rc->array (key);
249 271
250 glBegin (GL_QUADS); 272 arr.v2f (x11, y1);
251 glVertex2d (x11, y1); 273 arr.v2f (x21, y1);
252 glVertex2d (x12, y1); 274 arr.v2f (x22, y2);
253 glVertex2d (x22, y2); 275 arr.v2f (x12, y2);
254 glVertex2d (x21, y2);
255 glEnd ();
256
257 glEnable (GL_TEXTURE_2D);
258} 276}
259 277
260void 278void
261pango_opengl_render_layout_subpixel (PangoLayout *layout, 279pango_opengl_render_layout_subpixel (PangoLayout *layout,
280 rc_t *rc,
262 int x, int y, 281 int x, int y,
263 float r, float g, float b, float a) 282 float r, float g, float b, float a,
283 int flags)
264{ 284{
265 PangoContext *context; 285 PangoContext *context;
266 PangoFontMap *fontmap; 286 PangoFontMap *fontmap;
267 PangoRenderer *renderer; 287 PangoRenderer *renderer;
288 PangoOpenGLRenderer *gl;
268 289
269 context = pango_layout_get_context (layout); 290 context = pango_layout_get_context (layout);
270 fontmap = pango_context_get_font_map (context); 291 fontmap = pango_context_get_font_map (context);
271 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));
272
273 PANGO_OPENGL_RENDERER (renderer)->r = r; 293 gl = PANGO_OPENGL_RENDERER (renderer);
274 PANGO_OPENGL_RENDERER (renderer)->g = g; 294
275 PANGO_OPENGL_RENDERER (renderer)->b = b; 295 gl->rc = rc;
276 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;
277 301
278 pango_renderer_draw_layout (renderer, layout, x, y); 302 pango_renderer_draw_layout (renderer, layout, x, y);
279} 303}
280 304
281void 305void
282pango_opengl_render_layout (PangoLayout *layout, 306pango_opengl_render_layout (PangoLayout *layout,
307 rc_t *rc,
283 int x, int y, 308 int x, int y,
284 float r, float g, float b, float a) 309 float r, float g, float b, float a,
310 int flags)
285{ 311{
286 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 );
287} 315}
288 316
289static void 317static void
290pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 318pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
291{ 319{
320 memset (&renderer->key, 0, sizeof (rc_key_t));
321
292 renderer->r = 1.; 322 renderer->r = 1.;
293 renderer->g = 1.; 323 renderer->g = 1.;
294 renderer->b = 1.; 324 renderer->b = 1.;
295 renderer->a = 1.; 325 renderer->a = 1.;
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;
334 unsigned char r, g, b, a;
304 335
305 renderer->underline = PANGO_UNDERLINE_NONE; 336 renderer->underline = PANGO_UNDERLINE_NONE;
306 renderer->strikethrough = FALSE; 337 renderer->strikethrough = FALSE;
307 338
339 gl->key.mode = GL_QUADS;
340 gl->key.format = 0; // glyphs
341 gl->key.texname = 0;
342
308 for (l = run->item->analysis.extra_attrs; l; l = l->next) 343 for (l = run->item->analysis.extra_attrs; l; l = l->next)
309 { 344 {
310 PangoAttribute *attr = l->data; 345 PangoAttribute *attr = (PangoAttribute *)l->data;
311 346
312 switch (attr->klass->type) 347 switch (attr->klass->type)
313 { 348 {
314 case PANGO_ATTR_UNDERLINE: 349 case PANGO_ATTR_UNDERLINE:
315 renderer->underline = ((PangoAttrInt *)attr)->value; 350 renderer->underline = (PangoUnderline)((PangoAttrInt *)attr)->value;
316 break; 351 break;
317 352
318 case PANGO_ATTR_STRIKETHROUGH: 353 case PANGO_ATTR_STRIKETHROUGH:
319 renderer->strikethrough = ((PangoAttrInt *)attr)->value; 354 renderer->strikethrough = ((PangoAttrInt *)attr)->value;
320 break; 355 break;
… …
327 break; 362 break;
328 } 363 }
329 } 364 }
330 365
331 if (fg) 366 if (fg)
332 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 }
333 else 372 else
334 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;
335} 392}
336 393
337static void 394static void
338draw_begin (PangoRenderer *renderer_) 395draw_begin (PangoRenderer *renderer_)
339{ 396{
340 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 397 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
341
342 renderer->curtex = 0;
343
344 glEnable (GL_TEXTURE_2D);
345 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
346 glEnable (GL_BLEND);
347 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
348 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
349 glEnable (GL_ALPHA_TEST);
350 glAlphaFunc (GL_GREATER, 0.01f);
351} 398}
352 399
353static void 400static void
354draw_end (PangoRenderer *renderer_) 401draw_end (PangoRenderer *renderer_)
355{ 402{
356 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 403 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
357
358 if (renderer->curtex)
359 glEnd ();
360
361 glDisable (GL_ALPHA_TEST);
362 glDisable (GL_BLEND);
363 glDisable (GL_TEXTURE_2D);
364} 404}
365 405
366static void 406static void
367pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 407pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
368{ 408{

Diff Legend

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