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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.3 by root, Tue Jul 4 23:56:34 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
…		…
156	{	159	{
157	tc_put (&g->tex);	160	tc_put (&g->tex);
158	g_slice_free (glyph_info, g);	161	g_slice_free (glyph_info, g);
159	}	162	}
160		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
161	static void	202	static void
162	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)
163	{	204	{
164	PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);	205	PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
165	glyph_info *g;	206	glyph_info *g;
166	float x1, y1, x2, y2;
167		207
168	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)	208	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
169	{	209	{
170	glyph = pango_opengl_get_unknown_glyph (font);	210	glyph = pango_opengl_get_unknown_glyph (font);
171		211
…		…
178	if (!g \|\| g->generation != tc_generation)	218	if (!g \|\| g->generation != tc_generation)
179	{	219	{
180	Glyph bm;	220	Glyph bm;
181	font_render_glyph (&bm, font, glyph);	221	font_render_glyph (&bm, font, glyph);
182		222
183	if (g)	223	if (!g)
184	g->generation = tc_generation;
185	else
186	{	224	{
187	g = g_slice_new (glyph_info);	225	g = g_slice_new (glyph_info);
188		226
189	_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);
190	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);	228	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);
191	}	229	}
192		230
193	tc_get (&g->tex, bm.width, bm.height);	231	g->generation = tc_generation;
194		232
195	g->left = bm.left;	233	g->left = bm.left;
196	g->top = bm.top;	234	g->top = bm.top;
197		235
198	if (renderer->curtex)	236	tc_get (&g->tex, bm.width, bm.height);
199	{
200	glEnd ();
201	renderer->curtex = 0;
202	}
203		237
204	glBindTexture (GL_TEXTURE_2D, g->tex.name);	238	if (bm.width && bm.height)
205	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);
206	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
207	glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
208	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
209	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
210	}	240	}
211		241
212	x += g->left;	242	x += g->left;
213	y -= g->top;	243	y -= g->top;
214		244
215	x1 = g->tex.x * (1. / TC_WIDTH );
216	y1 = g->tex.y * (1. / TC_HEIGHT);
217	x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
218	y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
219
220	if (g->tex.name != renderer->curtex)	245	if (g->tex.name != renderer->key.texname)
221	{	246	{
222	if (renderer->curtex)
223	glEnd ();
224
225	glBindTexture (GL_TEXTURE_2D, g->tex.name);
226	renderer->curtex = g->tex.name;	247	renderer->key.texname = g->tex.name;
227	glBegin (GL_QUADS);	248	renderer->arr = rc_array (renderer->rc, &renderer->key);
228	}	249	}
229		250
230	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);
231	glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
232	glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
233	glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
234	}	252	}
235		253
236	static void	254	static void
237	draw_trapezoid (PangoRenderer *renderer_,	255	draw_trapezoid (PangoRenderer *renderer_,
238	PangoRenderPart part,	256	PangoRenderPart part,
…		…
242	double y2,	260	double y2,
243	double x12,	261	double x12,
244	double x22)	262	double x22)
245	{	263	{
246	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	264	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		265	rc_key_t key = renderer->key;
		266	rc_array_t *arr;
247		267
248	if (renderer->curtex)	268	key.mode = GL_QUADS;
249	{	269	key.format = GL_V2F;
250	glEnd ();	270	key.texname = 0;
251	renderer->curtex = 0;
252	}
253		271
254	glDisable (GL_TEXTURE_2D);	272	arr = rc_array (renderer->rc, &key);
255		273
256	glBegin (GL_QUADS);	274	rc_v2f (arr, x11, y1);
257	glVertex2d (x11, y1);	275	rc_v2f (arr, x21, y1);
258	glVertex2d (x12, y1);	276	rc_v2f (arr, x22, y2);
259	glVertex2d (x22, y2);	277	rc_v2f (arr, x12, y2);
260	glVertex2d (x21, y2);
261	glEnd ();
262
263	glEnable (GL_TEXTURE_2D);
264	}	278	}
265		279
266	void	280	void
267	pango_opengl_render_layout_subpixel (PangoLayout *layout,	281	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		282	rc_t *rc,
268	int x, int y,	283	int x, int y,
269	float r, float g, float b, float a)	284	float r, float g, float b, float a,
		285	int flags)
270	{	286	{
271	PangoContext *context;	287	PangoContext *context;
272	PangoFontMap *fontmap;	288	PangoFontMap *fontmap;
273	PangoRenderer *renderer;	289	PangoRenderer *renderer;
		290	PangoOpenGLRenderer *gl;
274		291
275	context = pango_layout_get_context (layout);	292	context = pango_layout_get_context (layout);
276	fontmap = pango_context_get_font_map (context);	293	fontmap = pango_context_get_font_map (context);
277	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));
278
279	PANGO_OPENGL_RENDERER (renderer)->r = r;	295	gl = PANGO_OPENGL_RENDERER (renderer);
280	PANGO_OPENGL_RENDERER (renderer)->g = g;	296
281	PANGO_OPENGL_RENDERER (renderer)->b = b;	297	gl->rc = rc;
282	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;
283		303
284	pango_renderer_draw_layout (renderer, layout, x, y);	304	pango_renderer_draw_layout (renderer, layout, x, y);
285	}	305	}
286		306
287	void	307	void
288	pango_opengl_render_layout (PangoLayout *layout,	308	pango_opengl_render_layout (PangoLayout *layout,
		309	rc_t *rc,
289	int x, int y,	310	int x, int y,
290	float r, float g, float b, float a)	311	float r, float g, float b, float a,
		312	int flags)
291	{	313	{
292	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	);
293	}	317	}
294		318
295	static void	319	static void
296	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	320	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
297	{	321	{
		322	memset (&renderer->key, 0, sizeof (rc_key_t));
		323
298	renderer->r = 1.;	324	renderer->r = 1.;
299	renderer->g = 1.;	325	renderer->g = 1.;
300	renderer->b = 1.;	326	renderer->b = 1.;
301	renderer->a = 1.;	327	renderer->a = 1.;
302	}	328	}
303		329
304	static void	330	static void
305	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	331	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
306	{	332	{
307	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	333	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
308	PangoColor *fg = 0;	334	PangoColor *fg = 0;
309	GSList *l;	335	GSList *l;
		336	unsigned char r, g, b, a;
310		337
311	renderer->underline = PANGO_UNDERLINE_NONE;	338	renderer->underline = PANGO_UNDERLINE_NONE;
312	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;
313		344
314	for (l = run->item->analysis.extra_attrs; l; l = l->next)	345	for (l = run->item->analysis.extra_attrs; l; l = l->next)
315	{	346	{
316	PangoAttribute *attr = l->data;	347	PangoAttribute *attr = l->data;
317		348
…		…
333	break;	364	break;
334	}	365	}
335	}	366	}
336		367
337	if (fg)	368	if (fg)
338	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	}
339	else	374	else
340	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;
341	}	394	}
342		395
343	static void	396	static void
344	draw_begin (PangoRenderer *renderer_)	397	draw_begin (PangoRenderer *renderer_)
345	{	398	{
346	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	399	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
347
348	renderer->curtex = 0;
349
350	glEnable (GL_TEXTURE_2D);
351	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
352	glEnable (GL_BLEND);
353	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
354	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
355	glEnable (GL_ALPHA_TEST);
356	glAlphaFunc (GL_GREATER, 0.01f);
357	}	400	}
358		401
359	static void	402	static void
360	draw_end (PangoRenderer *renderer_)	403	draw_end (PangoRenderer *renderer_)
361	{	404	{
362	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	405	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
363
364	if (renderer->curtex)
365	glEnd ();
366
367	glDisable (GL_ALPHA_TEST);
368	glDisable (GL_BLEND);
369	glDisable (GL_TEXTURE_2D);
370	}	406	}
371		407
372	static void	408	static void
373	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	409	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
374	{	410	{

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.3 by root, Tue Jul 4 23:56:34 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.3 by root, Tue Jul 4 23:56:34 2006 UTC vs.
Revision 1.16 by root, Thu Nov 26 07:19:11 2009 UTC