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

[cogl] deprecate cogl_viewport() in favour of cogl_set_viewport()

Browse Source 
cogl_viewport only accepted a viewport width and height, but there are times
when it's also desireable to have a viewport offset so that a scene can be
translated after projection but before hitting the framebuffer.
This commit is contained in:
Robert Bragg 2009-11-03 13:26:58 +00:00
parent 1e2d88e789
commit 8c3a132ecb
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@ -212,6 +212,12 @@ Release Notes for Clutter 1.2
* Clutter now depends on the system copy of JSON-GLib, and will fall * Clutter now depends on the system copy of JSON-GLib, and will fall
back to the internal copy only if JSON-GLib is not installed. back to the internal copy only if JSON-GLib is not installed.
Cogl API changes for Clutter 1.2
--------------------------------
* cogl_viewport is now deprecated in favour of cogl_set_viewport which
accepts a viewport offset.
Release Notes for Clutter 1.0 Release Notes for Clutter 1.0
------------------------------- -------------------------------

2
clutter/clutter-texture.c
View File

@ -571,7 +571,7 @@ clutter_texture_paint (ClutterActor *self)
clutter_texture_set_fbo_projection (self); clutter_texture_set_fbo_projection (self);
/* Reset the viewport to the size of the FBO */ /* Reset the viewport to the size of the FBO */
cogl_viewport (priv->image_width, priv->image_height); cogl_set_viewport (0, 0, priv->image_width, priv->image_height);
/* Reapply the source's parent transformations */ /* Reapply the source's parent transformations */
if ((source_parent = clutter_actor_get_parent (priv->fbo_source))) if ((source_parent = clutter_actor_get_parent (priv->fbo_source)))

12
clutter/cogl/cogl/cogl.c
View File

@ -538,10 +538,10 @@ _cogl_disable_clip_planes (void)
} }
void void
_cogl_set_viewport (int x, cogl_set_viewport (int x,
int y, int y,
int width, int width,
int height) int height)
{ {
CoglHandle draw_buffer; CoglHandle draw_buffer;
@ -562,7 +562,7 @@ void
cogl_viewport (guint width, cogl_viewport (guint width,
guint height) guint height)
{ {
_cogl_set_viewport (0, 0, width, height); cogl_set_viewport (0, 0, width, height);
} }
void void
@ -579,7 +579,7 @@ _cogl_setup_viewport (guint width,
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
cogl_viewport (width, height); cogl_set_viewport (0, 0, width, height);
/* For Ortho projection. /* For Ortho projection.
* _cogl_matrix_stack_ortho (projection_stack, 0, width, 0, height, -1, 1); * _cogl_matrix_stack_ortho (projection_stack, 0, width, 0, height, -1, 1);

22
clutter/cogl/cogl/cogl.h.in
View File

@ -219,6 +219,8 @@ void _cogl_setup_viewport (guint width,
float z_near, float z_near,
float z_far); float z_far);
#ifndef COGL_DISABLE_DEPRECATED
/** /**
* cogl_viewport: * cogl_viewport:
* @width: Width of the viewport * @width: Width of the viewport
@ -229,7 +231,25 @@ void _cogl_setup_viewport (guint width,
* Since: 0.8.2 * Since: 0.8.2
*/ */
void cogl_viewport (guint width, void cogl_viewport (guint width,
guint height); guint height) G_GNUC_DEPRECATED;
#endif
/**
* cogl_set_viewport:
* @x: viewport X offset
* @x: viewport Y offset
* @width: Width of the viewport
* @height: Height of the viewport
*
* Replace the current viewport with the given values.
*
* Since: 1.2
*/
void cogl_set_viewport (int x,
int y,
int width,
int height);
/** /**
* cogl_push_matrix: * cogl_push_matrix: