[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.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	if (renderer->curtex)	230	g->generation = tc_generation;
194	glEnd ();
195
196	tc_get (&g->tex, bm.width, bm.height);
197		231
198	g->left = bm.left;	232	g->left = bm.left;
199	g->top = bm.top;	233	g->top = bm.top;
200		234
201	glBindTexture (GL_TEXTURE_2D, g->tex.name);	235	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		236
208	renderer->curtex = g->tex.name;	237	if (bm.width && bm.height)
209	glBegin (GL_QUADS);	238	tex_update (g->tex.name, g->tex.x, g->tex.y, bm.width, bm.stride, bm.height, bm.bitmap);
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		247	renderer->arr = rc_array (renderer->rc, &renderer->key);
228	glBegin (GL_QUADS);
229	}	248	}
230		249
231	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);
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	}	251	}
236		252
237	static void	253	static void
238	draw_trapezoid (PangoRenderer *renderer_,	254	draw_trapezoid (PangoRenderer *renderer_,
239	PangoRenderPart part,	255	PangoRenderPart part,
…		…
243	double y2,	259	double y2,
244	double x12,	260	double x12,
245	double x22)	261	double x22)
246	{	262	{
247	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	263	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		264	rc_key_t key = renderer->key;
		265	rc_array_t *arr;
248		266
249	if (renderer->curtex)	267	key.mode = GL_QUADS;
250	{	268	key.format = GL_V2F;
251	glEnd ();	269	key.texname = 0;
252	renderer->curtex = 0;
253	}
254		270
255	glDisable (GL_TEXTURE_2D);	271	arr = rc_array (renderer->rc, &key);
256		272
257	glBegin (GL_QUADS);	273	rc_v2f (arr, x11, y1);
258	glVertex2d (x11, y1);	274	rc_v2f (arr, x21, y1);
259	glVertex2d (x12, y1);	275	rc_v2f (arr, x22, y2);
260	glVertex2d (x22, y2);	276	rc_v2f (arr, x12, y2);
261	glVertex2d (x21, y2);
262	glEnd ();
263
264	glEnable (GL_TEXTURE_2D);
265	}	277	}
266		278
267	void	279	void
268	pango_opengl_render_layout_subpixel (PangoLayout *layout,	280	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		281	rc_t *rc,
269	int x, int y,	282	int x, int y,
270	float r, float g, float b, float a)	283	float r, float g, float b, float a,
		284	int flags)
271	{	285	{
272	PangoContext *context;	286	PangoContext *context;
273	PangoFontMap *fontmap;	287	PangoFontMap *fontmap;
274	PangoRenderer *renderer;	288	PangoRenderer *renderer;
		289	PangoOpenGLRenderer *gl;
275		290
276	context = pango_layout_get_context (layout);	291	context = pango_layout_get_context (layout);
277	fontmap = pango_context_get_font_map (context);	292	fontmap = pango_context_get_font_map (context);
278	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));
279
280	PANGO_OPENGL_RENDERER (renderer)->r = r;	294	gl = PANGO_OPENGL_RENDERER (renderer);
281	PANGO_OPENGL_RENDERER (renderer)->g = g;	295
282	PANGO_OPENGL_RENDERER (renderer)->b = b;	296	gl->rc = rc;
283	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;
284		302
285	pango_renderer_draw_layout (renderer, layout, x, y);	303	pango_renderer_draw_layout (renderer, layout, x, y);
286	}	304	}
287		305
288	void	306	void
289	pango_opengl_render_layout (PangoLayout *layout,	307	pango_opengl_render_layout (PangoLayout *layout,
		308	rc_t *rc,
290	int x, int y,	309	int x, int y,
291	float r, float g, float b, float a)	310	float r, float g, float b, float a,
		311	int flags)
292	{	312	{
293	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	);
294	}	316	}
295		317
296	static void	318	static void
297	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	319	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
298	{	320	{
		321	memset (&renderer->key, 0, sizeof (rc_key_t));
		322
299	renderer->r = 1.;	323	renderer->r = 1.;
300	renderer->g = 1.;	324	renderer->g = 1.;
301	renderer->b = 1.;	325	renderer->b = 1.;
302	renderer->a = 1.;	326	renderer->a = 1.;
303	}	327	}
304		328
305	static void	329	static void
306	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	330	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
307	{	331	{
308	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	332	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
309	PangoColor *fg = 0;	333	PangoColor *fg = 0;
310	GSList *l;	334	GSList *l;
		335	unsigned char r, g, b, a;
311		336
312	renderer->underline = PANGO_UNDERLINE_NONE;	337	renderer->underline = PANGO_UNDERLINE_NONE;
313	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;
314		343
315	for (l = run->item->analysis.extra_attrs; l; l = l->next)	344	for (l = run->item->analysis.extra_attrs; l; l = l->next)
316	{	345	{
317	PangoAttribute *attr = l->data;	346	PangoAttribute *attr = l->data;
318		347
…		…
334	break;	363	break;
335	}	364	}
336	}	365	}
337		366
338	if (fg)	367	if (fg)
339	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	}
340	else	373	else
341	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;
342	}	393	}
343		394
344	static void	395	static void
345	draw_begin (PangoRenderer *renderer_)	396	draw_begin (PangoRenderer *renderer_)
346	{	397	{
347	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	398	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	}	399	}
359		400
360	static void	401	static void
361	draw_end (PangoRenderer *renderer_)	402	draw_end (PangoRenderer *renderer_)
362	{	403	{
363	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	404	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	}	405	}
372		406
373	static void	407	static void
374	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	408	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
375	{	409	{

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