diff options
| author | Neil Roberts <neil@linux.intel.com> | 2011-07-13 18:29:56 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2011-07-18 15:41:35 +0100 |
| commit | 231be91fb0abc2202d2209554bdb0a5fed58dd3f (patch) | |
| tree | bd8daf5e966c78a5c9ec2f4438d99c5cbd726eae /cogl/cogl-private.h | |
| parent | 2fc069888fa75aa77368136a68ccf734d213dcf2 (diff) | |
| download | cogl-231be91fb0abc2202d2209554bdb0a5fed58dd3f.tar.gz | |
Combine _cogl_context_check_gl_version and update_features into one
The _cogl_context_check_gl_version function is meant to be called once
Cogl has a GL context so that it can check whether the context found
is supported by Cogl. However, only the stub winsys was calling this
and it was doing it before Cogl had a chance to retrieve the function
pointer for glString so it would just crash. This patch combines the
two functions into one so that _cogl_context_update_features returns a
gboolean and a GError. Then it can just check the context itself.
https://bugzilla.gnome.org/show_bug.cgi?id=654440
Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'cogl/cogl-private.h')
| -rw-r--r-- | cogl/cogl-private.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/cogl/cogl-private.h b/cogl/cogl-private.h index 465b267c..eaa1d52f 100644 --- a/cogl/cogl-private.h +++ b/cogl/cogl-private.h @@ -27,18 +27,12 @@ G_BEGIN_DECLS gboolean -_cogl_gl_check_gl_version (CoglContext *context, - GError **error); - -void -_cogl_gl_update_features (CoglContext *context); +_cogl_gl_update_features (CoglContext *context, + GError **error); gboolean -_cogl_gles_check_gl_version (CoglContext *context, - GError **error); - -void -_cogl_gles_update_features (CoglContext *context); +_cogl_gles_update_features (CoglContext *context, + GError **error); gboolean _cogl_check_extension (const char *name, const char *ext); |