mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 20:42:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

[635/906] fixup compile errors

Browse source
This commit is contained in:
Matthew Waters 2013-01-07 14:08:39 +11:00 committed by Tim-Philipp Müller
parent 68b4ddff12
commit 17e6d70dba
3 changed files with 44 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/gl/glprototypes/opengl_functions.h
View file

@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include "gl-prototypes/cogl-opengl.h" #include "glprototypes/opengl.h"
#include "gl-prototypes/cogl-gles1-opengl.h" #include "glprototypes/gles1opengl.h"
#include "gl-prototypes/cogl-gles1-gles2-opengl.h" #include "glprototypes/gles1gles2opengl.h"
#include "gl-prototypes/cogl-gles2-opengl.h" #include "glprototypes/gles2opengl.h"

62
gst-libs/gst/gl/gstglfeature.c
View file

@ -59,7 +59,7 @@ gst_gl_check_extension (const char *name, const gchar * ext)
min_gl_major, min_gl_minor, \ min_gl_major, min_gl_minor, \
gles_availability, \ gles_availability, \
namespaces, extension_names) \ namespaces, extension_names) \
static const GstGLFeatureFunction cogl_ext_ ## name ## _funcs_opengl[] = { static const GstGLFeatureFunction gst_gl_ext_ ## name ## _funcs_opengl[] = {
#define GST_GL_EXT_FUNCTION(ret, name, args) \ #define GST_GL_EXT_FUNCTION(ret, name, args) \
{ G_STRINGIFY (name), G_STRUCT_OFFSET (GstGLFuncs, name) }, { G_STRINGIFY (name), G_STRUCT_OFFSET (GstGLFuncs, name) },
#define GST_GL_EXT_END() \ #define GST_GL_EXT_END() \
@ -68,20 +68,20 @@ gst_gl_check_extension (const char *name, const gchar * ext)
#include "glprototypes/opengl_functions.h" #include "glprototypes/opengl_functions.h"
#undef GST_GL_EXT_BEGIN #undef GST_GL_EXT_BEGIN
#define GST_GL_EXT_BEGIN(name, \ #define GST_GL_EXT_BEGIN(name, \
min_gl_major, min_gl_minor, \ min_gl_major, min_gl_minor, \
gles_availability, \ gles_availability, \
namespaces, extension_names) \ namespaces, extension_names) \
{ min_gl_major, min_gl_minor, gles_availability, namespaces, \ { min_gl_major, min_gl_minor, gles_availability, namespaces, \
extension_names, 0, \ extension_names, \
cogl_ext_ ## name ## _funcs_opengl }, gst_gl_ext_ ## name ## _funcs_opengl },
#undef GST_GL_EXT_FUNCTION #undef GST_GL_EXT_FUNCTION
#define GST_GL_EXT_FUNCTION(ret, name, args) #define GST_GL_EXT_FUNCTION(ret, name, args)
#undef GST_GL_EXT_END #undef GST_GL_EXT_END
#define GST_GL_EXT_END() #define GST_GL_EXT_END()
static const GstGLFeatureData cogl_feature_ext_functions_data_opengl[] = { static const GstGLFeatureData gst_gl_feature_ext_functions_data_opengl[] = {
#include "gl-prototypes/opengl_functions.h" #include "glprototypes/opengl_functions.h"
}; };
#endif /* HAVE_OPENGL */ #endif /* HAVE_OPENGL */
@ -90,11 +90,11 @@ static const GstGLFeatureData cogl_feature_ext_functions_data_opengl[] = {
#undef GST_GL_EXT_END #undef GST_GL_EXT_END
#if HAVE_GLES2 #if HAVE_GLES2
#define GST_GL_EXT_BEGIN(name, \ #define GST_GL_EXT_BEGIN(name, \
min_gl_major, min_gl_minor, \ min_gl_major, min_gl_minor, \
gles_availability, \ gles_availability, \
namespaces, extension_names) \ namespaces, extension_names) \
static const GstGLFeatureFunction cogl_ext_ ## name ## _funcs_gles2[] = { static const GstGLFeatureFunction gst_gl_ext_ ## name ## _funcs_gles2[] = {
#define GST_GL_EXT_FUNCTION(ret, name, args) \ #define GST_GL_EXT_FUNCTION(ret, name, args) \
{ G_STRINGIFY (name), G_STRUCT_OFFSET (GstGLES2Funcs, name) }, { G_STRINGIFY (name), G_STRUCT_OFFSET (GstGLES2Funcs, name) },
#define GST_GL_EXT_END() \ #define GST_GL_EXT_END() \
@ -108,14 +108,14 @@ static const GstGLFeatureData cogl_feature_ext_functions_data_opengl[] = {
gles_availability, \ gles_availability, \
namespaces, extension_names) \ namespaces, extension_names) \
{ min_gl_major, min_gl_minor, gles_availability, namespaces, \ { min_gl_major, min_gl_minor, gles_availability, namespaces, \
extension_names, 0, \ extension_names, \
cogl_ext_ ## name ## _funcs_gles2 }, gst_gl_ext_ ## name ## _funcs_gles2 },
#undef GST_GL_EXT_FUNCTION #undef GST_GL_EXT_FUNCTION
#define GST_GL_EXT_FUNCTION(ret, name, args) #define GST_GL_EXT_FUNCTION(ret, name, args)
#undef GST_GL_EXT_END #undef GST_GL_EXT_END
#define GST_GL_EXT_END() #define GST_GL_EXT_END()
static const GstGLFeatureData cogl_feature_ext_functions_data_gles2[] = { static const GstGLFeatureData gst_gl_feature_ext_functions_data_gles2[] = {
#include "glprototypes/gles2_functions.h" #include "glprototypes/gles2_functions.h"
}; };
#endif /* HAVE_GLES2 */ #endif /* HAVE_GLES2 */
@ -127,11 +127,26 @@ static const GstGLFeatureData cogl_feature_ext_functions_data_gles2[] = {
gboolean gboolean
_gst_gl_feature_check (GstGLDisplay * display, _gst_gl_feature_check (GstGLDisplay * display,
const char *driver_prefix, const char *driver_prefix,
const CoglFeatureData * data, const GstGLFeatureData * data,
int gl_major, int gl_minor, const char *extensions_string) int gl_major, int gl_minor, const char *extensions_string)
{ {
const char *suffix = NULL; const char *suffix = NULL;
int func_num; int func_num;
#if HAVE_OPENGL
static const GstGLFuncs *gst_gl = NULL;
#endif
#if HAVE_GLES2
static const GstGLES2Funcs *gst_gles2 = NULL;
#endif
#if HAVE_OPENGL
if (!gst_gl)
gst_gl = gst_gl_get_opengl_vtable ();
#endif
#if HAVE_GLES2
if (!gst_gles2)
gst_gles2 = gst_gl_get_gles2_vtable ();
#endif
/* First check whether the functions should be directly provided by /* First check whether the functions should be directly provided by
GL */ GL */
@ -139,7 +154,7 @@ _gst_gl_feature_check (GstGLDisplay * display,
GST_GL_CHECK_GL_VERSION (gl_major, gl_minor, GST_GL_CHECK_GL_VERSION (gl_major, gl_minor,
data->min_gl_major, data->min_gl_minor)) || data->min_gl_major, data->min_gl_minor)) ||
((display->gl_api & GST_GL_API_GLES2) && ((display->gl_api & GST_GL_API_GLES2) &&
(data->gles_availability & COGL_EXT_IN_GLES2))) { (data->gl_availability & GST_GL_API_GLES2))) {
suffix = ""; suffix = "";
} else { } else {
/* Otherwise try all of the extensions */ /* Otherwise try all of the extensions */
@ -206,13 +221,13 @@ _gst_gl_feature_check (GstGLDisplay * display,
/* Set the function pointer in the context */ /* Set the function pointer in the context */
#if HAVE_OPENGL #if HAVE_OPENGL
if (display->gl_api & GST_GL_API_OPENGL) { if (display->gl_api & GST_GL_API_OPENGL) {
*(void **) ((guint8 *) & gst_gl + *(void **) ((guint8 *) gst_gl +
data->functions[func_num].pointer_offset) = func; data->functions[func_num].pointer_offset) = func;
} }
#endif #endif
#if HAVE_GLES2 #if HAVE_GLES2
if (display->gl_api & GST_GL_API_GLES2) { if (display->gl_api & GST_GL_API_GLES2) {
*(void **) ((guint8 *) & gst_gles2 + *(void **) ((guint8 *) gst_gles2 +
data->functions[func_num].pointer_offset) = func; data->functions[func_num].pointer_offset) = func;
} }
#endif #endif
@ -227,13 +242,13 @@ error:
for (func_num = 0; data->functions[func_num].name; func_num++) { for (func_num = 0; data->functions[func_num].name; func_num++) {
#if HAVE_OPENGL #if HAVE_OPENGL
if (display->gl_api & GST_GL_API_OPENGL) { if (display->gl_api & GST_GL_API_OPENGL) {
*(void **) ((guint8 *) & gst_gl + *(void **) ((guint8 *) gst_gl +
data->functions[func_num].pointer_offset) = NULL; data->functions[func_num].pointer_offset) = NULL;
} }
#endif #endif
#if HAVE_GLES2 #if HAVE_GLES2
if (display->gl_api & GST_GL_API_GLES2) { if (display->gl_api & GST_GL_API_GLES2) {
*(void **) ((guint8 *) & gst_gles2 + *(void **) ((guint8 *) gst_gles2 +
data->functions[func_num].pointer_offset) = NULL; data->functions[func_num].pointer_offset) = NULL;
} }
#endif #endif
@ -250,17 +265,18 @@ _gst_gl_feature_check_ext_functions (GstGLDisplay * display,
#if HAVE_OPENGL #if HAVE_OPENGL
if (display->gl_api & GST_GL_API_OPENGL) { if (display->gl_api & GST_GL_API_OPENGL) {
for (i = 0; i < G_N_ELEMENTS (cogl_feature_ext_functions_data_opengl); i++) for (i = 0; i < G_N_ELEMENTS (gst_gl_feature_ext_functions_data_opengl);
_cogl_feature_check (display, "GL", i++)
cogl_feature_ext_functions_data_opengl + i, gl_major, gl_minor, _gst_gl_feature_check (display, "GL",
gst_gl_feature_ext_functions_data_opengl + i, gl_major, gl_minor,
gl_extensions); gl_extensions);
} }
#endif #endif
#if HAVE_GLES2 #if HAVE_GLES2
if (display->gl_api & GST_GL_API_GLES2) { if (display->gl_api & GST_GL_API_GLES2) {
for (i = 0; i < G_N_ELEMENTS (cogl_feature_ext_functions_data_gles2); i++) for (i = 0; i < G_N_ELEMENTS (gst_gl_feature_ext_functions_data_gles2); i++)
_cogl_feature_check (display, "GL", _gst_gl_feature_check (display, "GL",
cogl_feature_ext_functions_data_gles2 + i, gl_major, gl_minor, gst_gl_feature_ext_functions_data_gles2 + i, gl_major, gl_minor,
gl_extensions); gl_extensions);
} }
#endif #endif

9
gst-libs/gst/gl/gstglfeature.h
View file

@ -53,7 +53,7 @@ struct _GstGLFeatureData
int min_gl_major, min_gl_minor; int min_gl_major, min_gl_minor;
/* Flags specifying which versions of GL the feature is available /* Flags specifying which versions of GL the feature is available
in core in */ in core in */
GstGLApi gl_availability; GstGLAPI gl_availability;
/* \0 separated list of namespaces to try. Eg "EXT\0ARB\0" */ /* \0 separated list of namespaces to try. Eg "EXT\0ARB\0" */
const char *namespaces; const char *namespaces;
/* \0 separated list of required extension names without the GL_EXT /* \0 separated list of required extension names without the GL_EXT
@ -62,13 +62,6 @@ struct _GstGLFeatureData
extension is different from the namespace, you can specify it extension is different from the namespace, you can specify it
with a ':' after the namespace */ with a ':' after the namespace */
const char *extension_names; const char *extension_names;
/* A set of feature flags to enable if the extension is available */
GstGLFeatureFlags feature_flags;
/* A set of private feature flags to enable if the extension is
* available */
int feature_flags_private;
/* An optional corresponding winsys feature. */
// CoglWinsysFeature winsys_feature;
/* A list of functions required for this feature. Terminated with a /* A list of functions required for this feature. Terminated with a
NULL name */ NULL name */
const GstGLFeatureFunction *functions; const GstGLFeatureFunction *functions;