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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines