[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/pango-render.c

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.7 by root, Sat Aug 11 11:28:03 2007 UTC vs.
Revision 1.18 by root, Mon Dec 21 23:52:34 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
		164	static int apple_nvidia_bug_workaround;
		165
		166	static void
		167	apple_nvidia_bug (int enable)
		168	{
		169	apple_nvidia_bug_workaround = enable;
		170	}
		171
		172	static void
		173	tex_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
164	static void	201	static void
165	draw_glyph (PangoRenderer renderer_, PangoFont font, PangoGlyph glyph, double x, double y)	202	draw_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;
169	float x1, y1, x2, y2;
170		206
171	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)	207	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
172	{	208	{
173	glyph = pango_opengl_get_unknown_glyph (font);	209	glyph = pango_opengl_get_unknown_glyph (font);
174		210
…		…
181	if (!g \|\| g->generation != tc_generation)	217	if (!g \|\| g->generation != tc_generation)
182	{	218	{
183	Glyph bm;	219	Glyph bm;
184	font_render_glyph (&bm, font, glyph);	220	font_render_glyph (&bm, font, glyph);
185		221
186	if (g)	222	if (!g)
187	g->generation = tc_generation;
188	else
189	{	223	{
190	g = g_slice_new (glyph_info);	224	g = g_slice_new (glyph_info);
191		225
192	_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);
193	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);	227	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);
194	}	228	}
195		229
196	tc_get (&g->tex, bm.width, bm.height);	230	g->generation = tc_generation;
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);	236
203	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);	237	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);	238	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	}	239	}
208		240
209	x += g->left;	241	x += g->left;
210	y -= g->top;	242	y -= g->top;
211		243
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)	244	if (g->tex.name != renderer->key.texname)
218	{	245	{
219	renderer->key.texname = g->tex.name;	246	renderer->key.texname = g->tex.name;
220	renderer->arr = rc_array (renderer->rc, &renderer->key);	247	renderer->arr = rc_array (renderer->rc, &renderer->key);
221	}	248	}
222		249
223	rc_t2f_v3f (x1, y1, x , y , 0);	250	rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
224	rc_t2f_v3f (x2, y1, x + g->tex.w, y , 0);
225	rc_t2f_v3f (x2, y2, x + g->tex.w, y + g->tex.h, 0);
226	rc_t2f_v3f (x1, y2, x , y + g->tex.h, 0);
227	}	251	}
228		252
229	static void	253	static void
230	draw_trapezoid (PangoRenderer *renderer_,	254	draw_trapezoid (PangoRenderer *renderer_,
231	PangoRenderPart part,	255	PangoRenderPart part,
…		…
244	key.format = GL_V2F;	268	key.format = GL_V2F;
245	key.texname = 0;	269	key.texname = 0;
246		270
247	arr = rc_array (renderer->rc, &key);	271	arr = rc_array (renderer->rc, &key);
248		272
249	rc_v2f (x11, y1);	273	rc_v2f (arr, x11, y1);
250	rc_v2f (x21, y1);	274	rc_v2f (arr, x21, y1);
251	rc_v2f (x22, y2);	275	rc_v2f (arr, x22, y2);
252	rc_v2f (x12, y2);	276	rc_v2f (arr, x12, y2);
253	}	277	}
254		278
255	void	279	void
256	pango_opengl_render_layout_subpixel (PangoLayout *layout,	280	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		281	rc_t *rc,
257	int x, int y,	282	int x, int y,
258	float r, float g, float b, float a,	283	float r, float g, float b, float a,
259	int flags)	284	int flags)
260	{	285	{
261	PangoContext *context;	286	PangoContext *context;
262	PangoFontMap *fontmap;	287	PangoFontMap *fontmap;
263	PangoRenderer *renderer;	288	PangoRenderer *renderer;
		289	PangoOpenGLRenderer *gl;
264		290
265	context = pango_layout_get_context (layout);	291	context = pango_layout_get_context (layout);
266	fontmap = pango_context_get_font_map (context);	292	fontmap = pango_context_get_font_map (context);
267	renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));	293	renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
268
269	PANGO_OPENGL_RENDERER (renderer)->r = r;	294	gl = PANGO_OPENGL_RENDERER (renderer);
270	PANGO_OPENGL_RENDERER (renderer)->g = g;	295
271	PANGO_OPENGL_RENDERER (renderer)->b = b;	296	gl->rc = rc;
272	PANGO_OPENGL_RENDERER (renderer)->a = a;	297	gl->r = r;
273	PANGO_OPENGL_RENDERER (renderer)->flags = flags;	298	gl->g = g;
		299	gl->b = b;
		300	gl->a = a;
		301	gl->flags = flags;
274		302
275	pango_renderer_draw_layout (renderer, layout, x, y);	303	pango_renderer_draw_layout (renderer, layout, x, y);
276	}	304	}
277		305
278	void	306	void
279	pango_opengl_render_layout (PangoLayout *layout,	307	pango_opengl_render_layout (PangoLayout *layout,
		308	rc_t *rc,
280	int x, int y,	309	int x, int y,
281	float r, float g, float b, float a,	310	float r, float g, float b, float a,
282	int flags)	311	int flags)
283	{	312	{
284	pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags);	313	pango_opengl_render_layout_subpixel (
		314	layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
		315	);
285	}	316	}
286		317
287	static void	318	static void
288	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	319	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
289	{	320	{
…		…
296	}	327	}
297		328
298	static void	329	static void
299	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	330	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
300	{	331	{
301	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	332	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
302	PangoColor *fg = 0;	333	PangoColor *fg = 0;
303	GSList *l;	334	GSList *l;
304	unsigned char r, g, b, a;	335	unsigned char r, g, b, a;
305		336
306	renderer->underline = PANGO_UNDERLINE_NONE;	337	renderer->underline = PANGO_UNDERLINE_NONE;
307	renderer->strikethrough = FALSE;	338	renderer->strikethrough = FALSE;
308		339
309	renderer->key.mode = GL_QUADS;	340	gl->key.mode = GL_QUADS;
310	renderer->key.format = GL_T2F_V2F;	341	gl->key.format = 0; // glyphs
311	renderer->key.texname = 0;	342	gl->key.texname = 0;
312		343
313	for (l = run->item->analysis.extra_attrs; l; l = l->next)	344	for (l = run->item->analysis.extra_attrs; l; l = l->next)
314	{	345	{
315	PangoAttribute *attr = l->data;	346	PangoAttribute *attr = l->data;
316		347
…		…
339	g = fg->green * (255.f / 65535.f);	370	g = fg->green * (255.f / 65535.f);
340	b = fg->blue * (255.f / 65535.f);	371	b = fg->blue * (255.f / 65535.f);
341	}	372	}
342	else	373	else
343	{	374	{
344	r = glrenderer->r * 255.f;	375	r = gl->r * 255.f;
345	g = glrenderer->g * 255.f;	376	g = gl->g * 255.f;
346	b = glrenderer->b * 255.f;	377	b = gl->b * 255.f;
347	}	378	}
348		379
349	a = glrenderer->a * 255.f;	380	a = gl->a * 255.f;
350		381
351	if (glrenderer->flags & FLAG_INVERSE)	382	if (gl->flags & FLAG_INVERSE)
352	{	383	{
353	r ^= 0xffU;	384	r ^= 0xffU;
354	g ^= 0xffU;	385	g ^= 0xffU;
355	b ^= 0xffU;	386	b ^= 0xffU;
356	}	387	}
357		388
358	renderer->key.r = r;	389	gl->key.r = r;
359	renderer->key.g = g;	390	gl->key.g = g;
360	renderer->key.b = b;	391	gl->key.b = b;
361	renderer->key.a = a;	392	gl->key.a = a;
362	}	393	}
363		394
364	static void	395	static void
365	draw_begin (PangoRenderer *renderer_)	396	draw_begin (PangoRenderer *renderer_)
366	{	397	{
367	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	398	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
368
369	glEnable (GL_TEXTURE_2D);
370	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
371	glEnable (GL_BLEND);
372	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
373	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
374	glEnable (GL_ALPHA_TEST);
375	glAlphaFunc (GL_GREATER, 0.01f);
376	}	399	}
377		400
378	static void	401	static void
379	draw_end (PangoRenderer *renderer_)	402	draw_end (PangoRenderer *renderer_)
380	{	403	{
381	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	404	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
382
383	rc_draw (renderer->rc);
384
385	glDisable (GL_ALPHA_TEST);
386	glDisable (GL_BLEND);
387	glDisable (GL_TEXTURE_2D);
388	}	405	}
389		406
390	static void	407	static void
391	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	408	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
392	{	409	{

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.7 by root, Sat Aug 11 11:28:03 2007 UTC vs. Revision 1.18 by root, Mon Dec 21 23:52:34 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.7 by root, Sat Aug 11 11:28:03 2007 UTC vs.
Revision 1.18 by root, Mon Dec 21 23:52:34 2009 UTC