summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2011-08-25 17:35:34 +0100
committerRobert Bragg <robert@linux.intel.com>2011-09-05 17:54:46 +0100
commit6a2e21183c5b3215aa4af27c155e7a75567293a3 (patch)
tree012d255cb91fa37f33ee130918c1d8975ef00020
parent6584c183f03d42f4785f33524d028f41eb212843 (diff)
downloadcogl-6a2e21183c5b3215aa4af27c155e7a75567293a3.tar.gz
display: Add an accessor to get the renderer out of a display
https://bugzilla.gnome.org/show_bug.cgi?id=657347 Reviewed-by: Robert Bragg <robert@linux.intel.com>
-rw-r--r--cogl/cogl-display.c6
-rw-r--r--cogl/cogl-display.h4
-rw-r--r--doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt1
3 files changed, 11 insertions, 0 deletions
diff --git a/cogl/cogl-display.c b/cogl/cogl-display.c
index 1c64fe9e..b45560e0 100644
--- a/cogl/cogl-display.c
+++ b/cogl/cogl-display.c
@@ -119,6 +119,12 @@ cogl_display_new (CoglRenderer *renderer,
return _cogl_display_object_new (display);
}
+CoglRenderer *
+cogl_display_get_renderer (CoglDisplay *display)
+{
+ return display->renderer;
+}
+
gboolean
cogl_display_setup (CoglDisplay *display,
GError **error)
diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h
index 15f580ed..8cd215bf 100644
--- a/cogl/cogl-display.h
+++ b/cogl/cogl-display.h
@@ -81,6 +81,10 @@ CoglDisplay *
cogl_display_new (CoglRenderer *renderer,
CoglOnscreenTemplate *onscreen_template);
+#define cogl_display_get_rendrer cogl_display_get_rendrer_EXP
+CoglRenderer *
+cogl_display_get_renderer (CoglDisplay *display);
+
#define cogl_display_setup cogl_display_setup_EXP
gboolean
cogl_display_setup (CoglDisplay *display,
diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt
index 00e77927..2237345a 100644
--- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt
+++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt
@@ -57,6 +57,7 @@ cogl_onscreen_template_new
<FILE>cogl-display</FILE>
<TITLE>CoglDisplay: Setup a display pipeline</TITLE>
cogl_display_new
+cogl_display_get_renderer
cogl_display_setup
<SUBSECTION>