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.12 by root, Mon Aug 13 15:31:21 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;
… …
173 210
174 if (glyph == PANGO_GLYPH_EMPTY) 211 if (glyph == PANGO_GLYPH_EMPTY)
175 glyph = PANGO_GLYPH_UNKNOWN_FLAG; 212 glyph = PANGO_GLYPH_UNKNOWN_FLAG;
176 } 213 }
177 214
178 g = _pango_opengl_font_get_cache_glyph_data (font, glyph); 215 g = (glyph_info *)_pango_opengl_font_get_cache_glyph_data (font, glyph);
179 216
180 if (!g || g->generation != tc_generation) 217 if (!g || g->generation != tc_generation)
181 { 218 {
182 Glyph bm; 219 Glyph bm;
183 font_render_glyph (&bm, font, glyph); 220 font_render_glyph (&bm, font, glyph);
184 221
185 if (g) 222 if (!g)
186 g->generation = tc_generation;
187 else
188 { 223 {
189 g = g_slice_new (glyph_info); 224 g = g_slice_new (glyph_info);
190 225
191 _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);
192 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 227 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
193 } 228 }
194 229
195 tc_get (&g->tex, bm.width, bm.height); 230 g->generation = tc_generation;
196 231
197 g->left = bm.left; 232 g->left = bm.left;
198 g->top = bm.top; 233 g->top = bm.top;
199 234
200 glBindTexture (GL_TEXTURE_2D, g->tex.name); 235 tc_get (&g->tex, bm.width, bm.height);
201 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 236
202 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 237 if (bm.width && bm.height)
203 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);
204 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
205 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
206 } 239 }
207 240
208 x += g->left; 241 x += g->left;
209 y -= g->top; 242 y -= g->top;
210 243
211 if (g->tex.name != renderer->key.texname) 244 if (g->tex.name != renderer->key.texname)
212 { 245 {
213 renderer->key.texname = g->tex.name; 246 renderer->key.texname = g->tex.name;
214 renderer->arr = rc_array (renderer->rc, &renderer->key); 247 renderer->arr = &renderer->rc->array (renderer->key);
215 } 248 }
216 249
217 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);
218} 251}
219 252
220static void 253static void
221draw_trapezoid (PangoRenderer *renderer_, 254draw_trapezoid (PangoRenderer *renderer_,
222 PangoRenderPart part, 255 PangoRenderPart part,
… …
227 double x12, 260 double x12,
228 double x22) 261 double x22)
229{ 262{
230 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 263 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
231 rc_key_t key = renderer->key; 264 rc_key_t key = renderer->key;
232 rc_array_t *arr;
233 265
234 key.mode = GL_QUADS; 266 key.mode = GL_QUADS;
235 key.format = GL_V2F; 267 key.format = GL_V2F;
236 key.texname = 0; 268 key.texname = 0;
237 269
238 arr = rc_array (renderer->rc, &key); 270 auto &arr = renderer->rc->array (key);
239 271
240 rc_v2f (arr, x11, y1); 272 arr.v2f (x11, y1);
241 rc_v2f (arr, x21, y1); 273 arr.v2f (x21, y1);
242 rc_v2f (arr, x22, y2); 274 arr.v2f (x22, y2);
243 rc_v2f (arr, x12, y2); 275 arr.v2f (x12, y2);
244} 276}
245 277
246void 278void
247pango_opengl_render_layout_subpixel (PangoLayout *layout, 279pango_opengl_render_layout_subpixel (PangoLayout *layout,
248 rc_t *rc, 280 rc_t *rc,
249 int x, int y, 281 int x, int y,
250 float r, float g, float b, float a, 282 float r, float g, float b, float a,
251 int flags) 283 int flags)
… …
258 context = pango_layout_get_context (layout); 290 context = pango_layout_get_context (layout);
259 fontmap = pango_context_get_font_map (context); 291 fontmap = pango_context_get_font_map (context);
260 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));
261 gl = PANGO_OPENGL_RENDERER (renderer); 293 gl = PANGO_OPENGL_RENDERER (renderer);
262 294
263 gl->rc = rc; 295 gl->rc = rc;
264 gl->r = r; 296 gl->r = r;
265 gl->g = g; 297 gl->g = g;
266 gl->b = b; 298 gl->b = b;
267 gl->a = a; 299 gl->a = a;
268 gl->flags = flags; 300 gl->flags = flags;
269 301
270 pango_renderer_draw_layout (renderer, layout, x, y); 302 pango_renderer_draw_layout (renderer, layout, x, y);
271} 303}
272 304
273void 305void
274pango_opengl_render_layout (PangoLayout *layout, 306pango_opengl_render_layout (PangoLayout *layout,
275 rc_t *rc, 307 rc_t *rc,
276 int x, int y, 308 int x, int y,
277 float r, float g, float b, float a, 309 float r, float g, float b, float a,
278 int flags) 310 int flags)
279{ 311{
280 pango_opengl_render_layout_subpixel ( 312 pango_opengl_render_layout_subpixel (
281 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags 313 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
282 ); 314 );
283} 315}
284 316
285static void 317static void
286pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 318pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
… …
308 gl->key.format = 0; // glyphs 340 gl->key.format = 0; // glyphs
309 gl->key.texname = 0; 341 gl->key.texname = 0;
310 342
311 for (l = run->item->analysis.extra_attrs; l; l = l->next) 343 for (l = run->item->analysis.extra_attrs; l; l = l->next)
312 { 344 {
313 PangoAttribute *attr = l->data; 345 PangoAttribute *attr = (PangoAttribute *)l->data;
314 346
315 switch (attr->klass->type) 347 switch (attr->klass->type)
316 { 348 {
317 case PANGO_ATTR_UNDERLINE: 349 case PANGO_ATTR_UNDERLINE:
318 renderer->underline = ((PangoAttrInt *)attr)->value; 350 renderer->underline = (PangoUnderline)((PangoAttrInt *)attr)->value;
319 break; 351 break;
320 352
321 case PANGO_ATTR_STRIKETHROUGH: 353 case PANGO_ATTR_STRIKETHROUGH:
322 renderer->strikethrough = ((PangoAttrInt *)attr)->value; 354 renderer->strikethrough = ((PangoAttrInt *)attr)->value;
323 break; 355 break;
… …
335 { 367 {
336 r = fg->red * (255.f / 65535.f); 368 r = fg->red * (255.f / 65535.f);
337 g = fg->green * (255.f / 65535.f); 369 g = fg->green * (255.f / 65535.f);
338 b = fg->blue * (255.f / 65535.f); 370 b = fg->blue * (255.f / 65535.f);
339 } 371 }
340 else 372 else
341 { 373 {
342 r = gl->r * 255.f; 374 r = gl->r * 255.f;
343 g = gl->g * 255.f; 375 g = gl->g * 255.f;
344 b = gl->b * 255.f; 376 b = gl->b * 255.f;
345 } 377 }

Diff Legend

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