isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

2008-04-04 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-actor.c:
        Remove uneeded stage private member.
        Add show-on-set-parent prop and make so by default Actors are
        now automatically shown when reparented (#791)

        * clutter/eglx/clutter-backend-egl.c:
        * clutter/cogl/gles/cogl.c:
        A couple of minor comments.

        * clutter/eglnative/Makefile.am:
        Add missing clutter-egl.h header (back port from trunk)

        * tests/test-actors.c:
        Modify to take advantage of new show-on-set-parent functionality.
This commit is contained in:
Matthew Allum 2008-04-04 13:20:02 +00:00
parent f9039e53cb
commit 4ea9911f57
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gles/cogl.c
View File

@ -359,6 +359,8 @@ cogl_texture_quad (gint x1,
GE( glDrawArrays(GL_TRIANGLES, 0, 6) ); GE( glDrawArrays(GL_TRIANGLES, 0, 6) );
GE( glDisableClientState(GL_TEXTURE_COORD_ARRAY) ); GE( glDisableClientState(GL_TEXTURE_COORD_ARRAY) );
GE( glDisableClientState(GL_VERTEX_ARRAY) ); GE( glDisableClientState(GL_VERTEX_ARRAY) );
/* Note also see glDrawTexxOES for potential optimisation */
} }
void void
@ -645,8 +647,13 @@ cogl_fog_set (const ClutterColor *fog_color,
glFogx (GL_FOG_END, (GLfixed) z_far); glFogx (GL_FOG_END, (GLfixed) z_far);
} }
/* Offscreen - TODO: possible support from FBO's */ /* Offscreen - TODO: possible support from FBO's/PBuffers
* See;
* http://www.khronos.org/message_boards/viewtopic.php?t=589
* http://www.gamedev.net/community/forums/topic.asp?topic_id=369739
*
* Likely requires EGL 1.3 for eglBindTexImage
*/
COGLuint COGLuint
cogl_offscreen_create (COGLuint target_texture) cogl_offscreen_create (COGLuint target_texture)
{ {