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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.4 by root, Wed Jul 5 00:16:44 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	if (renderer->curtex)	231	g->generation = tc_generation;
194	glEnd ();
195
196	tc_get (&g->tex, bm.width, bm.height);
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);
203	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
204	glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
205	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
206	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
207		237
208	renderer->curtex = g->tex.name;	238	if (bm.width && bm.height)
209	glBegin (GL_QUADS);	239	tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
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		248	renderer->arr = rc_array (renderer->rc, &renderer->key);
228	glBegin (GL_QUADS);
229	}	249	}
230		250
231	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);
232	glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
233	glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
234	glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
235	}	252	}
236		253
237	static void	254	static void
238	draw_trapezoid (PangoRenderer *renderer_,	255	draw_trapezoid (PangoRenderer *renderer_,
239	PangoRenderPart part,	256	PangoRenderPart part,
…		…
243	double y2,	260	double y2,
244	double x12,	261	double x12,
245	double x22)	262	double x22)
246	{	263	{
247	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	264	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		265	rc_key_t key = renderer->key;
		266	rc_array_t *arr;
248		267
249	if (renderer->curtex)	268	key.mode = GL_QUADS;
250	{	269	key.format = GL_V2F;
251	glEnd ();	270	key.texname = 0;
252	renderer->curtex = 0;
253	}
254		271
255	glDisable (GL_TEXTURE_2D);	272	arr = rc_array (renderer->rc, &key);
256		273
257	glBegin (GL_QUADS);	274	rc_v2f (arr, x11, y1);
258	glVertex2d (x11, y1);	275	rc_v2f (arr, x21, y1);
259	glVertex2d (x12, y1);	276	rc_v2f (arr, x22, y2);
260	glVertex2d (x22, y2);	277	rc_v2f (arr, x12, y2);
261	glVertex2d (x21, y2);
262	glEnd ();
263
264	glEnable (GL_TEXTURE_2D);
265	}	278	}
266		279
267	void	280	void
268	pango_opengl_render_layout_subpixel (PangoLayout *layout,	281	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		282	rc_t *rc,
269	int x, int y,	283	int x, int y,
270	float r, float g, float b, float a)	284	float r, float g, float b, float a,
		285	int flags)
271	{	286	{
272	PangoContext *context;	287	PangoContext *context;
273	PangoFontMap *fontmap;	288	PangoFontMap *fontmap;
274	PangoRenderer *renderer;	289	PangoRenderer *renderer;
		290	PangoOpenGLRenderer *gl;
275		291
276	context = pango_layout_get_context (layout);	292	context = pango_layout_get_context (layout);
277	fontmap = pango_context_get_font_map (context);	293	fontmap = pango_context_get_font_map (context);
278	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));
279
280	PANGO_OPENGL_RENDERER (renderer)->r = r;	295	gl = PANGO_OPENGL_RENDERER (renderer);
281	PANGO_OPENGL_RENDERER (renderer)->g = g;	296
282	PANGO_OPENGL_RENDERER (renderer)->b = b;	297	gl->rc = rc;
283	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;
284		303
285	pango_renderer_draw_layout (renderer, layout, x, y);	304	pango_renderer_draw_layout (renderer, layout, x, y);
286	}	305	}
287		306
288	void	307	void
289	pango_opengl_render_layout (PangoLayout *layout,	308	pango_opengl_render_layout (PangoLayout *layout,
		309	rc_t *rc,
290	int x, int y,	310	int x, int y,
291	float r, float g, float b, float a)	311	float r, float g, float b, float a,
		312	int flags)
292	{	313	{
293	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	);
294	}	317	}
295		318
296	static void	319	static void
297	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	320	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
298	{	321	{
		322	memset (&renderer->key, 0, sizeof (rc_key_t));
		323
299	renderer->r = 1.;	324	renderer->r = 1.;
300	renderer->g = 1.;	325	renderer->g = 1.;
301	renderer->b = 1.;	326	renderer->b = 1.;
302	renderer->a = 1.;	327	renderer->a = 1.;
303	}	328	}
304		329
305	static void	330	static void
306	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	331	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
307	{	332	{
308	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	333	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
309	PangoColor *fg = 0;	334	PangoColor *fg = 0;
310	GSList *l;	335	GSList *l;
		336	unsigned char r, g, b, a;
311		337
312	renderer->underline = PANGO_UNDERLINE_NONE;	338	renderer->underline = PANGO_UNDERLINE_NONE;
313	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;
314		344
315	for (l = run->item->analysis.extra_attrs; l; l = l->next)	345	for (l = run->item->analysis.extra_attrs; l; l = l->next)
316	{	346	{
317	PangoAttribute *attr = l->data;	347	PangoAttribute *attr = l->data;
318		348
…		…
334	break;	364	break;
335	}	365	}
336	}	366	}
337		367
338	if (fg)	368	if (fg)
339	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	}
340	else	374	else
341	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;
342	}	394	}
343		395
344	static void	396	static void
345	draw_begin (PangoRenderer *renderer_)	397	draw_begin (PangoRenderer *renderer_)
346	{	398	{
347	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	399	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
348
349	renderer->curtex = 0;
350
351	glEnable (GL_TEXTURE_2D);
352	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
353	glEnable (GL_BLEND);
354	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
355	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
356	glEnable (GL_ALPHA_TEST);
357	glAlphaFunc (GL_GREATER, 0.01f);
358	}	400	}
359		401
360	static void	402	static void
361	draw_end (PangoRenderer *renderer_)	403	draw_end (PangoRenderer *renderer_)
362	{	404	{
363	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	405	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
364
365	if (renderer->curtex)
366	glEnd ();
367
368	glDisable (GL_ALPHA_TEST);
369	glDisable (GL_BLEND);
370	glDisable (GL_TEXTURE_2D);
371	}	406	}
372		407
373	static void	408	static void
374	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	409	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
375	{	410	{

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.4 by root, Wed Jul 5 00:16:44 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.4 by root, Wed Jul 5 00:16:44 2006 UTC vs.
Revision 1.16 by root, Thu Nov 26 07:19:11 2009 UTC