brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* clutter/eglnative/clutter-stage-egl.c

Browse Source 
(clutter_stage_egl_realize): Use ES 2 renderable type when
	building for GLES 2.

	* clutter/eglnative/clutter-event-egl.c (get_backend_time): Added
	a NULL for the microseconds parameter of g_timer_elapsed.

	* clutter/eglnative/clutter-stage-egl.h: 
	* clutter/eglnative/clutter-egl.h: 
	* clutter/eglnative/clutter-backend-egl.h: Include
	clutter-egl-headers.h instead of including the GL headers directly
	so it can include gl2.h when building for GLES 2.

	* clutter/eglnative/clutter-egl-headers.h: 
	* clutter/eglnative/Makefile.am (libclutter_eglnative_la_SOURCES):
	Added clutter-egl-headers.h

	* clutter/cogl/gles/cogl-fixed-fragment-shader.glsl: GLES 2
	doesn't provide a default precision for floats in the fragment
	shader and it will reject the shader if there isn't one.
This commit is contained in:
Neil Roberts
2008-06-06 14:21:22 +00:00
parent 9d8bfaf997
commit 1bfeddaaee
9 changed files with 88 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/eglnative/clutter-event-egl.c
View File

@ -88,7 +88,7 @@ get_backend_time (void)
backend_egl = CLUTTER_BACKEND_EGL (clutter_get_default_backend ());
return g_timer_elapsed (backend_egl->event_timer) * 1000;
return g_timer_elapsed (backend_egl->event_timer, NULL) * 1000;
}
void