[mutter] cogl/frame-info: Stop passing the CoglOutput
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl/frame-info: Stop passing the CoglOutput
- Date: Fri, 5 Jun 2020 21:56:22 +0000 (UTC)
commit 83ee122fadb00797ce8a4f06653df3f30c721993
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Fri May 22 21:44:36 2020 +0200
cogl/frame-info: Stop passing the CoglOutput
It's unused, and if it would be, it'd be unreliable, as it'd only be
valid on the Xlib and GLX cogl backends.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1289
cogl/cogl/cogl-frame-info-private.h | 2 --
cogl/cogl/cogl-frame-info.c | 6 ------
cogl/cogl/cogl-frame-info.h | 14 --------------
cogl/cogl/winsys/cogl-winsys-glx.c | 2 --
4 files changed, 24 deletions(-)
---
diff --git a/cogl/cogl/cogl-frame-info-private.h b/cogl/cogl/cogl-frame-info-private.h
index 16d393e1cc..f0324f2517 100644
--- a/cogl/cogl/cogl-frame-info-private.h
+++ b/cogl/cogl/cogl-frame-info-private.h
@@ -43,8 +43,6 @@ struct _CoglFrameInfo
float refresh_rate;
int64_t global_frame_counter;
-
- CoglOutput *output;
};
CoglFrameInfo *_cogl_frame_info_new (void);
diff --git a/cogl/cogl/cogl-frame-info.c b/cogl/cogl/cogl-frame-info.c
index 0455db1c11..1071495a04 100644
--- a/cogl/cogl/cogl-frame-info.c
+++ b/cogl/cogl/cogl-frame-info.c
@@ -72,12 +72,6 @@ cogl_frame_info_get_refresh_rate (CoglFrameInfo *info)
return info->refresh_rate;
}
-CoglOutput *
-cogl_frame_info_get_output (CoglFrameInfo *info)
-{
- return info->output;
-}
-
int64_t
cogl_frame_info_get_global_frame_counter (CoglFrameInfo *info)
{
diff --git a/cogl/cogl/cogl-frame-info.h b/cogl/cogl/cogl-frame-info.h
index e35336b00f..8acbb34bd1 100644
--- a/cogl/cogl/cogl-frame-info.h
+++ b/cogl/cogl/cogl-frame-info.h
@@ -126,20 +126,6 @@ int64_t cogl_frame_info_get_presentation_time (CoglFrameInfo *info);
COGL_EXPORT
float cogl_frame_info_get_refresh_rate (CoglFrameInfo *info);
-/**
- * cogl_frame_info_get_output:
- * @info: a #CoglFrameInfo object
- *
- * Gets the #CoglOutput that the swapped frame was presented to.
- *
- * Return value: (transfer none): The #CoglOutput that the frame was
- * presented to, or %NULL if this could not be determined.
- * Since: 1.14
- * Stability: unstable
- */
-COGL_EXPORT CoglOutput *
-cogl_frame_info_get_output (CoglFrameInfo *info);
-
/**
* cogl_frame_info_get_global_frame_counter: (skip)
*/
diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
index c2deaeb8b3..86d5acd05f 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/cogl/winsys/cogl-winsys-glx.c
@@ -1662,8 +1662,6 @@ set_frame_info_output (CoglOnscreen *onscreen,
{
CoglFrameInfo *info = g_queue_peek_tail (&onscreen->pending_frame_infos);
- info->output = output;
-
if (output)
{
float refresh_rate = cogl_output_get_refresh_rate (output);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]