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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.6 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.17 by root, Sun Nov 29 14:45:12 2009 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.6 by root, Sun Aug 13 15:14:17 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.6 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.17 by root, Sun Nov 29 14:45:12 2009 UTC