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.15 by root, Sun Jan 13 08:31:45 2008 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);
… …
196 g->top = bm.top; 233 g->top = bm.top;
197 234
198 tc_get (&g->tex, bm.width, bm.height); 235 tc_get (&g->tex, bm.width, bm.height);
199 236
200 if (bm.width && bm.height) 237 if (bm.width && bm.height)
201 { 238 tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
202 glBindTexture (GL_TEXTURE_2D, g->tex.name);
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 }
209 } 239 }
210 240
211 x += g->left; 241 x += g->left;
212 y -= g->top; 242 y -= g->top;
213 243
214 if (g->tex.name != renderer->key.texname) 244 if (g->tex.name != renderer->key.texname)
215 { 245 {
216 renderer->key.texname = g->tex.name; 246 renderer->key.texname = g->tex.name;
217 renderer->arr = rc_array (renderer->rc, &renderer->key); 247 renderer->arr = &renderer->rc->array (renderer->key);
218 } 248 }
219 249
220 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);
221} 251}
222 252
223static void 253static void
224draw_trapezoid (PangoRenderer *renderer_, 254draw_trapezoid (PangoRenderer *renderer_,
225 PangoRenderPart part, 255 PangoRenderPart part,
… …
230 double x12, 260 double x12,
231 double x22) 261 double x22)
232{ 262{
233 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 263 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
234 rc_key_t key = renderer->key; 264 rc_key_t key = renderer->key;
235 rc_array_t *arr;
236 265
237 key.mode = GL_QUADS; 266 key.mode = GL_QUADS;
238 key.format = GL_V2F; 267 key.format = GL_V2F;
239 key.texname = 0; 268 key.texname = 0;
240 269
241 arr = rc_array (renderer->rc, &key); 270 auto &arr = renderer->rc->array (key);
242 271
243 rc_v2f (arr, x11, y1); 272 arr.v2f (x11, y1);
244 rc_v2f (arr, x21, y1); 273 arr.v2f (x21, y1);
245 rc_v2f (arr, x22, y2); 274 arr.v2f (x22, y2);
246 rc_v2f (arr, x12, y2); 275 arr.v2f (x12, y2);
247} 276}
248 277
249void 278void
250pango_opengl_render_layout_subpixel (PangoLayout *layout, 279pango_opengl_render_layout_subpixel (PangoLayout *layout,
251 rc_t *rc, 280 rc_t *rc,
252 int x, int y, 281 int x, int y,
253 float r, float g, float b, float a, 282 float r, float g, float b, float a,
254 int flags) 283 int flags)
… …
261 context = pango_layout_get_context (layout); 290 context = pango_layout_get_context (layout);
262 fontmap = pango_context_get_font_map (context); 291 fontmap = pango_context_get_font_map (context);
263 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));
264 gl = PANGO_OPENGL_RENDERER (renderer); 293 gl = PANGO_OPENGL_RENDERER (renderer);
265 294
266 gl->rc = rc; 295 gl->rc = rc;
267 gl->r = r; 296 gl->r = r;
268 gl->g = g; 297 gl->g = g;
269 gl->b = b; 298 gl->b = b;
270 gl->a = a; 299 gl->a = a;
271 gl->flags = flags; 300 gl->flags = flags;
272 301
273 pango_renderer_draw_layout (renderer, layout, x, y); 302 pango_renderer_draw_layout (renderer, layout, x, y);
274} 303}
275 304
276void 305void
277pango_opengl_render_layout (PangoLayout *layout, 306pango_opengl_render_layout (PangoLayout *layout,
278 rc_t *rc, 307 rc_t *rc,
279 int x, int y, 308 int x, int y,
280 float r, float g, float b, float a, 309 float r, float g, float b, float a,
281 int flags) 310 int flags)
… …
311 gl->key.format = 0; // glyphs 340 gl->key.format = 0; // glyphs
312 gl->key.texname = 0; 341 gl->key.texname = 0;
313 342
314 for (l = run->item->analysis.extra_attrs; l; l = l->next) 343 for (l = run->item->analysis.extra_attrs; l; l = l->next)
315 { 344 {
316 PangoAttribute *attr = l->data; 345 PangoAttribute *attr = (PangoAttribute *)l->data;
317 346
318 switch (attr->klass->type) 347 switch (attr->klass->type)
319 { 348 {
320 case PANGO_ATTR_UNDERLINE: 349 case PANGO_ATTR_UNDERLINE:
321 renderer->underline = ((PangoAttrInt *)attr)->value; 350 renderer->underline = (PangoUnderline)((PangoAttrInt *)attr)->value;
322 break; 351 break;
323 352
324 case PANGO_ATTR_STRIKETHROUGH: 353 case PANGO_ATTR_STRIKETHROUGH:
325 renderer->strikethrough = ((PangoAttrInt *)attr)->value; 354 renderer->strikethrough = ((PangoAttrInt *)attr)->value;
326 break; 355 break;
… …
338 { 367 {
339 r = fg->red * (255.f / 65535.f); 368 r = fg->red * (255.f / 65535.f);
340 g = fg->green * (255.f / 65535.f); 369 g = fg->green * (255.f / 65535.f);
341 b = fg->blue * (255.f / 65535.f); 370 b = fg->blue * (255.f / 65535.f);
342 } 371 }
343 else 372 else
344 { 373 {
345 r = gl->r * 255.f; 374 r = gl->r * 255.f;
346 g = gl->g * 255.f; 375 g = gl->g * 255.f;
347 b = gl->b * 255.f; 376 b = gl->b * 255.f;
348 } 377 }

Diff Legend

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