[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.17 by root, Sun Nov 29 14:45:12 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 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);
		181	glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, bm);
		182	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
		183	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
		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
161	static void	201	static void
162	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)
163	{	203	{
164	PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);	204	PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
165	glyph_info *g;	205	glyph_info *g;
166	float x1, y1, x2, y2;
167		206
168	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)	207	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
169	{	208	{
170	glyph = pango_opengl_get_unknown_glyph (font);	209	glyph = pango_opengl_get_unknown_glyph (font);
171		210
…		…
178	if (!g \|\| g->generation != tc_generation)	217	if (!g \|\| g->generation != tc_generation)
179	{	218	{
180	Glyph bm;	219	Glyph bm;
181	font_render_glyph (&bm, font, glyph);	220	font_render_glyph (&bm, font, glyph);
182		221
183	if (g)	222	if (!g)
184	g->generation = tc_generation;
185	else
186	{	223	{
187	g = g_slice_new (glyph_info);	224	g = g_slice_new (glyph_info);
188		225
189	_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);
190	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);	227	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);
191	}	228	}
192		229
193	tc_get (&g->tex, bm.width, bm.height);	230	g->generation = tc_generation;
194		231
195	g->left = bm.left;	232	g->left = bm.left;
196	g->top = bm.top;	233	g->top = bm.top;
197		234
198	if (renderer->curtex)	235	tc_get (&g->tex, bm.width, bm.height);
199	{
200	glEnd ();
201	renderer->curtex = 0;
202	}
203		236
204	glBindTexture (GL_TEXTURE_2D, g->tex.name);	237	if (bm.width && bm.height)
205	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);	238	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	}	239	}
211		240
212	x += g->left;	241	x += g->left;
213	y -= g->top;	242	y -= g->top;
214		243
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)	244	if (g->tex.name != renderer->key.texname)
221	{	245	{
222	if (renderer->curtex)
223	glEnd ();
224
225	glBindTexture (GL_TEXTURE_2D, g->tex.name);
226	renderer->curtex = g->tex.name;	246	renderer->key.texname = g->tex.name;
227	glBegin (GL_QUADS);	247	renderer->arr = rc_array (renderer->rc, &renderer->key);
228	}	248	}
229		249
230	glTexCoord2f (x1, y1); glVertex2i (x , y );	250	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	}	251	}
235		252
236	static void	253	static void
237	draw_trapezoid (PangoRenderer *renderer_,	254	draw_trapezoid (PangoRenderer *renderer_,
238	PangoRenderPart part,	255	PangoRenderPart part,
…		…
242	double y2,	259	double y2,
243	double x12,	260	double x12,
244	double x22)	261	double x22)
245	{	262	{
246	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	263	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		264	rc_key_t key = renderer->key;
		265	rc_array_t *arr;
247		266
248	if (renderer->curtex)	267	key.mode = GL_QUADS;
249	{	268	key.format = GL_V2F;
250	glEnd ();	269	key.texname = 0;
251	renderer->curtex = 0;
252	}
253		270
254	glDisable (GL_TEXTURE_2D);	271	arr = rc_array (renderer->rc, &key);
255		272
256	glBegin (GL_QUADS);	273	rc_v2f (arr, x11, y1);
257	glVertex2d (x11, y1);	274	rc_v2f (arr, x21, y1);
258	glVertex2d (x12, y1);	275	rc_v2f (arr, x22, y2);
259	glVertex2d (x22, y2);	276	rc_v2f (arr, x12, y2);
260	glVertex2d (x21, y2);
261	glEnd ();
262
263	glEnable (GL_TEXTURE_2D);
264	}	277	}
265		278
266	void	279	void
267	pango_opengl_render_layout_subpixel (PangoLayout *layout,	280	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		281	rc_t *rc,
268	int x, int y,	282	int x, int y,
269	float r, float g, float b, float a)	283	float r, float g, float b, float a,
		284	int flags)
270	{	285	{
271	PangoContext *context;	286	PangoContext *context;
272	PangoFontMap *fontmap;	287	PangoFontMap *fontmap;
273	PangoRenderer *renderer;	288	PangoRenderer *renderer;
		289	PangoOpenGLRenderer *gl;
274		290
275	context = pango_layout_get_context (layout);	291	context = pango_layout_get_context (layout);
276	fontmap = pango_context_get_font_map (context);	292	fontmap = pango_context_get_font_map (context);
277	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));
278
279	PANGO_OPENGL_RENDERER (renderer)->r = r;	294	gl = PANGO_OPENGL_RENDERER (renderer);
280	PANGO_OPENGL_RENDERER (renderer)->g = g;	295
281	PANGO_OPENGL_RENDERER (renderer)->b = b;	296	gl->rc = rc;
282	PANGO_OPENGL_RENDERER (renderer)->a = a;	297	gl->r = r;
		298	gl->g = g;
		299	gl->b = b;
		300	gl->a = a;
		301	gl->flags = flags;
283		302
284	pango_renderer_draw_layout (renderer, layout, x, y);	303	pango_renderer_draw_layout (renderer, layout, x, y);
285	}	304	}
286		305
287	void	306	void
288	pango_opengl_render_layout (PangoLayout *layout,	307	pango_opengl_render_layout (PangoLayout *layout,
		308	rc_t *rc,
289	int x, int y,	309	int x, int y,
290	float r, float g, float b, float a)	310	float r, float g, float b, float a,
		311	int flags)
291	{	312	{
292	pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a);	313	pango_opengl_render_layout_subpixel (
		314	layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
		315	);
293	}	316	}
294		317
295	static void	318	static void
296	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	319	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
297	{	320	{
		321	memset (&renderer->key, 0, sizeof (rc_key_t));
		322
298	renderer->r = 1.;	323	renderer->r = 1.;
299	renderer->g = 1.;	324	renderer->g = 1.;
300	renderer->b = 1.;	325	renderer->b = 1.;
301	renderer->a = 1.;	326	renderer->a = 1.;
302	}	327	}
303		328
304	static void	329	static void
305	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	330	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
306	{	331	{
307	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	332	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
308	PangoColor *fg = 0;	333	PangoColor *fg = 0;
309	GSList *l;	334	GSList *l;
		335	unsigned char r, g, b, a;
310		336
311	renderer->underline = PANGO_UNDERLINE_NONE;	337	renderer->underline = PANGO_UNDERLINE_NONE;
312	renderer->strikethrough = FALSE;	338	renderer->strikethrough = FALSE;
		339
		340	gl->key.mode = GL_QUADS;
		341	gl->key.format = 0; // glyphs
		342	gl->key.texname = 0;
313		343
314	for (l = run->item->analysis.extra_attrs; l; l = l->next)	344	for (l = run->item->analysis.extra_attrs; l; l = l->next)
315	{	345	{
316	PangoAttribute *attr = l->data;	346	PangoAttribute *attr = l->data;
317		347
…		…
333	break;	363	break;
334	}	364	}
335	}	365	}
336		366
337	if (fg)	367	if (fg)
338	glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a);	368	{
		369	r = fg->red * (255.f / 65535.f);
		370	g = fg->green * (255.f / 65535.f);
		371	b = fg->blue * (255.f / 65535.f);
		372	}
339	else	373	else
340	glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a);	374	{
		375	r = gl->r * 255.f;
		376	g = gl->g * 255.f;
		377	b = gl->b * 255.f;
		378	}
		379
		380	a = gl->a * 255.f;
		381
		382	if (gl->flags & FLAG_INVERSE)
		383	{
		384	r ^= 0xffU;
		385	g ^= 0xffU;
		386	b ^= 0xffU;
		387	}
		388
		389	gl->key.r = r;
		390	gl->key.g = g;
		391	gl->key.b = b;
		392	gl->key.a = a;
341	}	393	}
342		394
343	static void	395	static void
344	draw_begin (PangoRenderer *renderer_)	396	draw_begin (PangoRenderer *renderer_)
345	{	397	{
346	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	398	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	}	399	}
358		400
359	static void	401	static void
360	draw_end (PangoRenderer *renderer_)	402	draw_end (PangoRenderer *renderer_)
361	{	403	{
362	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	404	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	}	405	}
371		406
372	static void	407	static void
373	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	408	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
374	{	409	{

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.17 by root, Sun Nov 29 14:45:12 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.17 by root, Sun Nov 29 14:45:12 2009 UTC