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.9 by root, Sat Aug 11 11:41:24 2007 UTC vs.
Revision 1.16 by root, Thu Nov 26 07:19:11 2009 UTC

… …
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 char *apple_nvidia_bug_buf;
165
166static void
167apple_nvidia_bug (int enable)
168{
169 g_slice_free1 (TC_WIDTH * TC_HEIGHT, apple_nvidia_bug_buf);
170 apple_nvidia_bug_buf = enable ? g_slice_alloc (TC_WIDTH * TC_HEIGHT) : 0;
171}
172
173static void
174tex_update (int name, int x, int y, int w, int stride, int h, void *bm)
175{
176 glBindTexture (GL_TEXTURE_2D, name);
177
178 if (!apple_nvidia_bug_buf)
179 {
180 glPixelStorei (GL_UNPACK_ROW_LENGTH, stride);
181 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
182 glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm);
183 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
184 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
185 }
186 else
187 {
188 /* starting with 10.5.5 (or 10.5.6), pple's nvidia driver corrupts textures */
189 /* when glTexSubImage is used, so do it the horribly slow way, */
190 /* reading/patching/uploading the full texture one each change */
191 int r;
192
193 glGetTexImage (GL_TEXTURE_2D, 0, GL_ALPHA, GL_UNSIGNED_BYTE, apple_nvidia_bug_buf);
194
195 for (r = 0; r < h; ++r)
196 memcpy ((char *)apple_nvidia_bug_buf + (y + r) * TC_WIDTH + x, (char *)bm + r * stride, w);
197
198 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, TC_WIDTH, TC_HEIGHT, 0, GL_ALPHA, GL_UNSIGNED_BYTE, apple_nvidia_bug_buf);
199 }
200}
201
164static void 202static void
165draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 203draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
166{ 204{
167 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 205 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
168 glyph_info *g; 206 glyph_info *g;
169 float x1, y1, x2, y2;
170 207
171 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 208 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
172 { 209 {
173 glyph = pango_opengl_get_unknown_glyph (font); 210 glyph = pango_opengl_get_unknown_glyph (font);
174 211
… …
181 if (!g || g->generation != tc_generation) 218 if (!g || g->generation != tc_generation)
182 { 219 {
183 Glyph bm; 220 Glyph bm;
184 font_render_glyph (&bm, font, glyph); 221 font_render_glyph (&bm, font, glyph);
185 222
186 if (g) 223 if (!g)
187 g->generation = tc_generation;
188 else
189 { 224 {
190 g = g_slice_new (glyph_info); 225 g = g_slice_new (glyph_info);
191 226
192 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info); 227 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
193 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 228 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
194 } 229 }
195 230
196 tc_get (&g->tex, bm.width, bm.height); 231 g->generation = tc_generation;
197 232
198 g->left = bm.left; 233 g->left = bm.left;
199 g->top = bm.top; 234 g->top = bm.top;
200 235
201 glBindTexture (GL_TEXTURE_2D, g->tex.name); 236 tc_get (&g->tex, bm.width, bm.height);
202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 237
203 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 238 if (bm.width && bm.height)
204 glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap); 239 tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
205 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
206 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
207 } 240 }
208 241
209 x += g->left; 242 x += g->left;
210 y -= g->top; 243 y -= g->top;
211 244
212 x1 = g->tex.x * (1. / TC_WIDTH );
213 y1 = g->tex.y * (1. / TC_HEIGHT);
214 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
215 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
216
217 if (g->tex.name != renderer->key.texname) 245 if (g->tex.name != renderer->key.texname)
218 { 246 {
219 renderer->key.texname = g->tex.name; 247 renderer->key.texname = g->tex.name;
220 renderer->arr = rc_array (renderer->rc, &renderer->key); 248 renderer->arr = rc_array (renderer->rc, &renderer->key);
221 } 249 }
222 250
223 rc_t2f_v3f (renderer->arr, x1, y1, x , y , 0); 251 rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
224 rc_t2f_v3f (renderer->arr, x2, y1, x + g->tex.w, y , 0);
225 rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
226 rc_t2f_v3f (renderer->arr, x1, y2, x , y + g->tex.h, 0);
227} 252}
228 253
229static void 254static void
230draw_trapezoid (PangoRenderer *renderer_, 255draw_trapezoid (PangoRenderer *renderer_,
231 PangoRenderPart part, 256 PangoRenderPart part,
… …
252 rc_v2f (arr, x12, y2); 277 rc_v2f (arr, x12, y2);
253} 278}
254 279
255void 280void
256pango_opengl_render_layout_subpixel (PangoLayout *layout, 281pango_opengl_render_layout_subpixel (PangoLayout *layout,
282 rc_t *rc,
257 int x, int y, 283 int x, int y,
258 float r, float g, float b, float a, 284 float r, float g, float b, float a,
259 int flags) 285 int flags)
260{ 286{
261 PangoContext *context; 287 PangoContext *context;
… …
266 context = pango_layout_get_context (layout); 292 context = pango_layout_get_context (layout);
267 fontmap = pango_context_get_font_map (context); 293 fontmap = pango_context_get_font_map (context);
268 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 294 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
269 gl = PANGO_OPENGL_RENDERER (renderer); 295 gl = PANGO_OPENGL_RENDERER (renderer);
270 296
271 gl->rc = rc_alloc (); 297 gl->rc = rc;
272 gl->r = r; 298 gl->r = r;
273 gl->g = g; 299 gl->g = g;
274 gl->b = b; 300 gl->b = b;
275 gl->a = a; 301 gl->a = a;
276 gl->flags = flags; 302 gl->flags = flags;
277 303
278 glEnable (GL_TEXTURE_2D);
279 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
280 glEnable (GL_BLEND);
281 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
282 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
283 glEnable (GL_ALPHA_TEST);
284 glAlphaFunc (GL_GREATER, 0.01f);
285
286 pango_renderer_draw_layout (renderer, layout, x, y); 304 pango_renderer_draw_layout (renderer, layout, x, y);
287
288 rc_draw (gl->rc);
289
290 glDisable (GL_ALPHA_TEST);
291 glDisable (GL_BLEND);
292 glDisable (GL_TEXTURE_2D);
293
294 rc_free (gl->rc);
295} 305}
296 306
297void 307void
298pango_opengl_render_layout (PangoLayout *layout, 308pango_opengl_render_layout (PangoLayout *layout,
309 rc_t *rc,
299 int x, int y, 310 int x, int y,
300 float r, float g, float b, float a, 311 float r, float g, float b, float a,
301 int flags) 312 int flags)
302{ 313{
303 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags); 314 pango_opengl_render_layout_subpixel (
315 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
316 );
304} 317}
305 318
306static void 319static void
307pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 320pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
308{ 321{
… …
324 337
325 renderer->underline = PANGO_UNDERLINE_NONE; 338 renderer->underline = PANGO_UNDERLINE_NONE;
326 renderer->strikethrough = FALSE; 339 renderer->strikethrough = FALSE;
327 340
328 gl->key.mode = GL_QUADS; 341 gl->key.mode = GL_QUADS;
329 gl->key.format = GL_T2F_V3F; 342 gl->key.format = 0; // glyphs
330 gl->key.texname = 0; 343 gl->key.texname = 0;
331 344
332 for (l = run->item->analysis.extra_attrs; l; l = l->next) 345 for (l = run->item->analysis.extra_attrs; l; l = l->next)
333 { 346 {
334 PangoAttribute *attr = l->data; 347 PangoAttribute *attr = l->data;

Diff Legend

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