summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2013-01-24 22:12:47 -0500
committerOwen W. Taylor <otaylor@fishsoup.net>2013-01-25 00:18:55 -0500
commit38ac56be4a0af4048091cfa3f7fd206a0d4db424 (patch)
tree21c5e064adcad17a65b1208e5614224c2d0491da
parent5cc26c82555e01ca7370772b73b93ca00772c37a (diff)
downloadcogl-38ac56be4a0af4048091cfa3f7fd206a0d4db424.tar.gz
Remove cogl_frame_info_get_frame_time()
The frame_time isn't closely associated with an onscreen - an update could involve multiple stages (in a stage-per-output scenario, perhaps.) If an application or toolkit needs to know the frame time for a FrameInfo it will have to do that association itself.
-rw-r--r--cogl/cogl-frame-info-private.h1
-rw-r--r--cogl/cogl-frame-info.c6
-rw-r--r--cogl/cogl-frame-info.h16
-rw-r--r--cogl/cogl-onscreen.c3
-rw-r--r--cogl/cogl-onscreen.h5
5 files changed, 2 insertions, 29 deletions
diff --git a/cogl/cogl-frame-info-private.h b/cogl/cogl-frame-info-private.h
index ef24d54a..dfce6d09 100644
--- a/cogl/cogl-frame-info-private.h
+++ b/cogl/cogl-frame-info-private.h
@@ -32,7 +32,6 @@ struct _CoglFrameInfo
CoglObject _parent;
int64_t frame_counter;
- int64_t frame_time;
int64_t presentation_time;
float refresh_rate;
diff --git a/cogl/cogl-frame-info.c b/cogl/cogl-frame-info.c
index bb4059fe..c5921709 100644
--- a/cogl/cogl-frame-info.c
+++ b/cogl/cogl-frame-info.c
@@ -60,12 +60,6 @@ cogl_frame_info_get_frame_counter (CoglFrameInfo *info)
}
int64_t
-cogl_frame_info_get_frame_time (CoglFrameInfo *info)
-{
- return info->frame_time;
-}
-
-int64_t
cogl_frame_info_get_presentation_time (CoglFrameInfo *info)
{
return info->presentation_time;
diff --git a/cogl/cogl-frame-info.h b/cogl/cogl-frame-info.h
index 64dabc57..242e608f 100644
--- a/cogl/cogl-frame-info.h
+++ b/cogl/cogl-frame-info.h
@@ -82,22 +82,6 @@ CoglBool cogl_frame_info_get_complete (CoglFrameInfo *info);
int64_t cogl_frame_info_get_frame_counter (CoglFrameInfo *info);
/**
- * cogl_frame_info_get_frame_time:
- * @info: a #CoglFrameInfo object
- *
- * Gets the time used for creating content for the frame. This
- * is determined by the time passed to cogl_onscreen_begin_frame(),
- * and will typically be the current time when rendering started
- * for the frame.
- *
- * Return value: the time used for coreating content for the frame,
- * in the timescale of g_get_monotonic_time().
- * Since: 2.0
- * Stability: unstable
- */
-int64_t cogl_frame_info_get_frame_time (CoglFrameInfo *info);
-
-/**
* cogl_frame_info_get_presentation_time:
* @info: a #CoglFrameInfo object
*
diff --git a/cogl/cogl-onscreen.c b/cogl/cogl-onscreen.c
index a1481dae..19ddce07 100644
--- a/cogl/cogl-onscreen.c
+++ b/cogl/cogl-onscreen.c
@@ -567,8 +567,7 @@ cogl_onscreen_get_frame_counter (CoglOnscreen *onscreen)
}
void
-cogl_onscreen_begin_frame (CoglOnscreen *onscreen,
- int64_t frame_time)
+cogl_onscreen_begin_frame (CoglOnscreen *onscreen)
{
onscreen->frame_counter++;
onscreen->current_frame_info = (onscreen->current_frame_info + 1) % COGL_ONSCREEN_MAX_FRAME_INFOS;
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h
index 7954eb47..050e1917 100644
--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@@ -696,8 +696,6 @@ cogl_onscreen_get_frame_counter (CoglOnscreen *onscreen);
/**
* cogl_onscreen_begin_frame:
* @onscreen: a #CoglOnscreen framebuffer
- * @frame_time: the time that should be used for creating
- * content for this frame.
*
* Marks the beginning of a frame. This increases the frame
* counter value and creates a new #CoglFrameInfo objeect.
@@ -705,8 +703,7 @@ cogl_onscreen_get_frame_counter (CoglOnscreen *onscreen);
* Since: 2.0
*/
void
-cogl_onscreen_begin_frame (CoglOnscreen *onscreen,
- int64_t frame_time);
+cogl_onscreen_begin_frame (CoglOnscreen *onscreen);
/**
* cogl_onscreen_get_frame_history_start: