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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.1 by root, Tue Jul 4 23:23:32 2006 UTC vs.
Revision 1.16 by root, Thu Nov 26 07:19:11 2009 UTC

…		…
35		35
36	struct _PangoOpenGLRenderer	36	struct _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_array_t *arr;
41	};	44	};
42		45
43	G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER)	46	G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER)
44		47
45	typedef struct	48	typedef struct
…		…
100	}	103	}
101		104
102	static void	105	static void
103	font_render_glyph (Glyph glyph, PangoFont font, int glyph_index)	106	font_render_glyph (Glyph glyph, PangoFont font, int glyph_index)
104	{	107	{
		108	FT_Face face;
		109
105	if (glyph_index & PANGO_GLYPH_UNKNOWN_FLAG)	110	if (glyph_index & PANGO_GLYPH_UNKNOWN_FLAG)
106	{	111	{
107	PangoFontMetrics *metrics;	112	PangoFontMetrics *metrics;
108		113
109	if (!font)	114	if (!font)
…		…
120	pango_font_metrics_unref (metrics);	125	pango_font_metrics_unref (metrics);
121		126
122	return;	127	return;
123	}	128	}
124		129
125	FT_Face face = pango_opengl_font_get_face (font);	130	face = pango_opengl_font_get_face (font);
126		131
127	if (face)	132	if (face)
128	{	133	{
129	PangoOpenGLFont glfont = (PangoOpenGLFont )font;	134	PangoOpenGLFont glfont = (PangoOpenGLFont )font;
130		135
…		…
144	}	149	}
145		150
146	typedef struct glyph_info {	151	typedef struct glyph_info {
147	tc_area tex;	152	tc_area tex;
148	int left, top;	153	int left, top;
		154	int generation;
149	} glyph_info;	155	} glyph_info;
150		156
151	static void	157	static void
152	free_glyph_info (glyph_info *g)	158	free_glyph_info (glyph_info *g)
153	{	159	{
154	tc_put (&g->tex);	160	tc_put (&g->tex);
155	g_slice_free (glyph_info, g);	161	g_slice_free (glyph_info, g);
156	}	162	}
157		163
		164	static char *apple_nvidia_bug_buf;
		165
		166	static void
		167	apple_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
		173	static void
		174	tex_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
158	static void	202	static void
159	draw_glyph (PangoRenderer renderer_, PangoFont font, PangoGlyph glyph, double x, double y)	203	draw_glyph (PangoRenderer renderer_, PangoFont font, PangoGlyph glyph, double x, double y)
160	{	204	{
161	PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);	205	PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
		206	glyph_info *g;
162		207
163	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)	208	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
164	{	209	{
165	glyph = pango_opengl_get_unknown_glyph (font);	210	glyph = pango_opengl_get_unknown_glyph (font);
166		211
167	if (glyph == PANGO_GLYPH_EMPTY)	212	if (glyph == PANGO_GLYPH_EMPTY)
168	glyph = PANGO_GLYPH_UNKNOWN_FLAG;	213	glyph = PANGO_GLYPH_UNKNOWN_FLAG;
169	}	214	}
170		215
171	glyph_info *g = _pango_opengl_font_get_cache_glyph_data (font, glyph);	216	g = _pango_opengl_font_get_cache_glyph_data (font, glyph);
172		217
173	if (!g)	218	if (!g \|\| g->generation != tc_generation)
174	{	219	{
175	Glyph bm;	220	Glyph bm;
176	font_render_glyph (&bm, font, glyph);	221	font_render_glyph (&bm, font, glyph);
177		222
		223	if (!g)
		224	{
178	g = g_slice_new (glyph_info);	225	g = g_slice_new (glyph_info);
179		226
180	tc_get (&g->tex, bm.width, bm.height);	227	_pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
		228	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);
		229	}
		230
		231	g->generation = tc_generation;
181		232
182	g->left = bm.left;	233	g->left = bm.left;
183	g->top = bm.top;	234	g->top = bm.top;
184		235
185	if (renderer->curtex)	236	tc_get (&g->tex, bm.width, bm.height);
186	{
187	glEnd ();
188	renderer->curtex = 0;
189	}
190		237
191	glBindTexture (GL_TEXTURE_2D, g->tex.name);	238	if (bm.width && bm.height)
192	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);	239	tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
193	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
194	glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
195	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
196	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
197
198	_pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
199	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);
200	}	240	}
201		241
202	x += g->left;	242	x += g->left;
203	y -= g->top;	243	y -= g->top;
204		244
205	float x1 = g->tex.x * (1. / TC_WIDTH );
206	float y1 = g->tex.y * (1. / TC_HEIGHT);
207	float x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
208	float y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
209
210	if (g->tex.name != renderer->curtex)	245	if (g->tex.name != renderer->key.texname)
211	{	246	{
212	if (renderer->curtex)
213	glEnd ();
214
215	glBindTexture (GL_TEXTURE_2D, g->tex.name);
216	renderer->curtex = g->tex.name;	247	renderer->key.texname = g->tex.name;
217	glBegin (GL_QUADS);	248	renderer->arr = rc_array (renderer->rc, &renderer->key);
218	}	249	}
219		250
220	glTexCoord2f (x1, y1); glVertex2i (x , y );	251	rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
221	glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
222	glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
223	glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
224	}	252	}
225		253
226	static void	254	static void
227	draw_trapezoid (PangoRenderer *renderer_,	255	draw_trapezoid (PangoRenderer *renderer_,
228	PangoRenderPart part,	256	PangoRenderPart part,
…		…
232	double y2,	260	double y2,
233	double x12,	261	double x12,
234	double x22)	262	double x22)
235	{	263	{
236	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	264	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		265	rc_key_t key = renderer->key;
		266	rc_array_t *arr;
237		267
238	if (renderer->curtex)	268	key.mode = GL_QUADS;
239	{	269	key.format = GL_V2F;
240	glEnd ();	270	key.texname = 0;
241	renderer->curtex = 0;
242	}
243		271
244	glDisable (GL_TEXTURE_2D);	272	arr = rc_array (renderer->rc, &key);
245		273
246	glBegin (GL_QUADS);	274	rc_v2f (arr, x11, y1);
247	glVertex2d (x11, y1);	275	rc_v2f (arr, x21, y1);
248	glVertex2d (x12, y1);	276	rc_v2f (arr, x22, y2);
249	glVertex2d (x22, y2);	277	rc_v2f (arr, x12, y2);
250	glVertex2d (x21, y2);
251	glEnd ();
252
253	glEnable (GL_TEXTURE_2D);
254	}	278	}
255		279
256	void	280	void
257	pango_opengl_render_layout_subpixel (PangoLayout *layout,	281	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		282	rc_t *rc,
258	int x, int y,	283	int x, int y,
259	float r, float g, float b, float a)	284	float r, float g, float b, float a,
		285	int flags)
260	{	286	{
261	PangoContext *context;	287	PangoContext *context;
262	PangoFontMap *fontmap;	288	PangoFontMap *fontmap;
263	PangoRenderer *renderer;	289	PangoRenderer *renderer;
		290	PangoOpenGLRenderer *gl;
264		291
265	context = pango_layout_get_context (layout);	292	context = pango_layout_get_context (layout);
266	fontmap = pango_context_get_font_map (context);	293	fontmap = pango_context_get_font_map (context);
267	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));
268
269	PANGO_OPENGL_RENDERER (renderer)->r = r;	295	gl = PANGO_OPENGL_RENDERER (renderer);
270	PANGO_OPENGL_RENDERER (renderer)->g = g;	296
271	PANGO_OPENGL_RENDERER (renderer)->b = b;	297	gl->rc = rc;
272	PANGO_OPENGL_RENDERER (renderer)->a = a;	298	gl->r = r;
		299	gl->g = g;
		300	gl->b = b;
		301	gl->a = a;
		302	gl->flags = flags;
273		303
274	pango_renderer_draw_layout (renderer, layout, x, y);	304	pango_renderer_draw_layout (renderer, layout, x, y);
275	}	305	}
276		306
277	void	307	void
278	pango_opengl_render_layout (PangoLayout *layout,	308	pango_opengl_render_layout (PangoLayout *layout,
		309	rc_t *rc,
279	int x, int y,	310	int x, int y,
280	float r, float g, float b, float a)	311	float r, float g, float b, float a,
		312	int flags)
281	{	313	{
282	pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a);	314	pango_opengl_render_layout_subpixel (
		315	layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
		316	);
283	}	317	}
284		318
285	static void	319	static void
286	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	320	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
287	{	321	{
		322	memset (&renderer->key, 0, sizeof (rc_key_t));
		323
288	renderer->r = 1.;	324	renderer->r = 1.;
289	renderer->g = 1.;	325	renderer->g = 1.;
290	renderer->b = 1.;	326	renderer->b = 1.;
291	renderer->a = 1.;	327	renderer->a = 1.;
292	}	328	}
293		329
294	static void	330	static void
295	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	331	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
296	{	332	{
297	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	333	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
298	PangoColor *fg = 0;	334	PangoColor *fg = 0;
299	GSList *l;	335	GSList *l;
		336	unsigned char r, g, b, a;
300		337
301	renderer->underline = PANGO_UNDERLINE_NONE;	338	renderer->underline = PANGO_UNDERLINE_NONE;
302	renderer->strikethrough = FALSE;	339	renderer->strikethrough = FALSE;
		340
		341	gl->key.mode = GL_QUADS;
		342	gl->key.format = 0; // glyphs
		343	gl->key.texname = 0;
303		344
304	for (l = run->item->analysis.extra_attrs; l; l = l->next)	345	for (l = run->item->analysis.extra_attrs; l; l = l->next)
305	{	346	{
306	PangoAttribute *attr = l->data;	347	PangoAttribute *attr = l->data;
307		348
…		…
323	break;	364	break;
324	}	365	}
325	}	366	}
326		367
327	if (fg)	368	if (fg)
328	glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a);	369	{
		370	r = fg->red * (255.f / 65535.f);
		371	g = fg->green * (255.f / 65535.f);
		372	b = fg->blue * (255.f / 65535.f);
		373	}
329	else	374	else
330	glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a);	375	{
		376	r = gl->r * 255.f;
		377	g = gl->g * 255.f;
		378	b = gl->b * 255.f;
		379	}
		380
		381	a = gl->a * 255.f;
		382
		383	if (gl->flags & FLAG_INVERSE)
		384	{
		385	r ^= 0xffU;
		386	g ^= 0xffU;
		387	b ^= 0xffU;
		388	}
		389
		390	gl->key.r = r;
		391	gl->key.g = g;
		392	gl->key.b = b;
		393	gl->key.a = a;
331	}	394	}
332		395
333	static void	396	static void
334	draw_begin (PangoRenderer *renderer_)	397	draw_begin (PangoRenderer *renderer_)
335	{	398	{
336	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	399	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
337
338	renderer->curtex = 0;
339
340	glEnable (GL_TEXTURE_2D);
341	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
342	glEnable (GL_BLEND);
343	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
344	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
345	glEnable (GL_ALPHA_TEST);
346	glAlphaFunc (GL_GREATER, 0.01f);
347	}	400	}
348		401
349	static void	402	static void
350	draw_end (PangoRenderer *renderer_)	403	draw_end (PangoRenderer *renderer_)
351	{	404	{
352	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	405	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
353
354	if (renderer->curtex)
355	glEnd ();
356
357	glDisable (GL_ALPHA_TEST);
358	glDisable (GL_BLEND);
359	glDisable (GL_TEXTURE_2D);
360	}	406	}
361		407
362	static void	408	static void
363	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	409	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
364	{	410	{

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.1 by root, Tue Jul 4 23:23:32 2006 UTC vs. Revision 1.16 by root, Thu Nov 26 07:19:11 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.1 by root, Tue Jul 4 23:23:32 2006 UTC vs.
Revision 1.16 by root, Thu Nov 26 07:19:11 2009 UTC