summaryrefslogtreecommitdiff
path: root/configure.ac
Commit message (Collapse)AuthorAgeFilesLines
* configure: improve the error message if gbm missingRobert Bragg2013-11-281-1/+1
| | | | | | | | | This improves the error message in the case where libgbm is missing when the KMS egl platform has been enabled. https://bugzilla.gnome.org/show_bug.cgi?id=706808 Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Build a .xz file on release instead of a .bzip2 fileNeil Roberts2013-09-231-1/+1
| | | | | | | | | | | Previously when we released a .bzip2 file the Gnome release scripts will just convert this to a .xz file and generate its own checksum. The .bzip2 is never actually available on the FTP server. This isn't ideal because we were listing the checksum of the .bzip2 file in the release message but that is useless information. This patch changes it to generate a .xz file instead which is also what Clutter does. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Fix the documented default value for --enable-cogl-pathNeil Roberts2013-08-191-1/+1
| | | | | | | As far as I can tell --enable-cogl-path is enabled by default but the help string for it was suggesting otherwise. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Fix the help string for --enable-standaloneNeil Roberts2013-08-191-1/+1
| | | | | | | | The help string had the wrong name presumably resulting from a cut and paste error of the --enable-debug option. Reviewed-by: Robert Bragg <robert@linux.intel.com> Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>
* Install conformance testsMatthias Clasen2013-07-091-0/+11
| | | | | | | | | Install the conformance tests, and metadata to run them with gnome-desktop-testing-runner. https://bugzilla.gnome.org/show_bug.cgi?id=702942 Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Fix the GBM_MICRO macroNeil Roberts2013-07-041-1/+1
| | | | | | | | | The version of gbm can sometimes be suffixed with ‘-devel’. This was making the GBM_MICRO define come out as 0-devel which was generating a warning when it was used in a #if check. This patch makes it chop off anything after a ‘-’ using sed. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Set the minimum required wayland-server version to 1.1.90Neil Roberts2013-07-011-2/+4
| | | | | | | | | | Since the Wayland server support has been updated to use wl_shm_buffer we need the latest git version of Wayland to build. Previously the configure.ac file only had one define for the minimum version of both the client-side and server-side support but as they are now different this patch splits them out. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Adds "webgl" driverRobert Bragg2013-06-121-0/+1
| | | | | | | | | This adds a COGL_DRIVER_WEBGL enum and a new driver description for webgl in cogl-renderer.c. This also adds a COGL_DRIVER_FLAG_OPENGL_WEB driver flag and a HAVE_COGL_WEBGL define which we can start to use to handle special cases where webgl differs from gles2. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Separate out CoglPath api into sub-libraryRobert Bragg2013-06-121-4/+24
| | | | | | | | | | | | | | | | | | | | | | | This splits out the cogl_path_ api into a separate cogl-path sub-library like cogl-pango and cogl-gst. This enables developers to build Cogl with this sub-library disabled if they don't need it which can be useful when its important to keep the size of an application and its dependencies down to a minimum. The functions cogl_framebuffer_{fill,stroke}_path have been renamed to cogl_path_{fill,stroke}. There were a few places in core cogl and cogl-gst that referenced the CoglPath api and these have been decoupled by using the CoglPrimitive api instead. In the case of cogl_framebuffer_push_path_clip() the core clip stack no longer accepts path clips directly but it's now possible to get a CoglPrimitive for the fill of a path and so the implementation of cogl_framebuffer_push_path_clip() now lives in cogl-path and works as a shim that first gets a CoglPrimitive and uses cogl_framebuffer_push_primitive_clip instead. We may want to consider renaming cogl_framebuffer_push_path_clip to put it in the cogl_path_ namespace. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* tests: Adds our first white-box unit testRobert Bragg2013-06-061-2/+16
| | | | | | | | | | | | | | | | | | This adds a white-box unit test that verifies that GL_BLEND is disabled when drawing an opaque rectangle, enabled when drawing a transparent rectangle and then disabled again when drawing a transparent rectangle but with a blend string that effectively disables blending. This shares the test utilities and launcher infrastructure we are using for conformance tests so we get consistent reporting and so unit tests will be run against a range of different drivers. This adds a --enable-unit-tests configure option which is enabled by default but if disabled will make all UNIT_TESTS() into static inline functions that we should expect the compiler to discard since they won't be referenced by anything. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Adds initial Emscripten support to CoglRobert Bragg2013-05-291-93/+179
| | | | | | | | | | | | | | | | | | This enables basic Emscripten support in Cogl via the SDL winsys. Assuming you have setup an emscripten toolchain you can configure Cogl like this: emconfigure ./configure --enable-debug --enable-emscripten Building the examples will build .html files that can be loaded directly by a WebGL enabled browser. Note: at this point the emscripten support has just barely been smoke tested so it's expected that as we continue to build on this we will learn about more things we need to change in Cogl to full support this environment. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* cogl-gst: Add some documentationNeil Roberts2013-04-251-0/+6
| | | | | | | | | | | | | | Adds documentation comments to CoglGstVideoSink and makes it generate a separate manual to contain it. One thing that I wasn't able to figure out with this was how to get the documentation to have correct references to the main Cogl docs. You can pass arguments to gtkdoc-fixxref to point to other manuals, but presumably this needs the installed locations and when the Cogl-Gst documentation is generated the Cogl docs may not have been installed yet. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Fix a warning about ‘sincos’ in examples/cogl-gles2-gearsNeil Roberts2013-04-231-0/+6
| | | | | | | | | | | | | | ‘sincos’ is a GNU extension. cogl-gles2-gears was using it without defining _GNU_SOURCE so it was generating some annoying warnings. This patch fixes it by making the example include config.h which will end up defining _GNU_SOURCE. In addition this patch adds a configure check for the function and provides a fallback if it's not available. https://bugzilla.gnome.org/show_bug.cgi?id=697330 Reviewed-by: Robert Bragg <robert@linux.intel.com>
* build: Use LT_LIB_M to find the math library in a portable wayEmanuele Aina2013-04-231-0/+6
| | | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=697330 Reviewed-by: Robert Bragg <robert@linux.intel.com> Reviewed-by: Neil Roberts <neil@linux.intel.com>
* quartz-image: Pass -framework ApplicationServices in the linker flagsNeil Roberts2013-04-041-0/+1
| | | | | | | | | | | The quartz image backend is using functions from the ApplicationServices framework and I was getting linker errors if I didn't use this option. I'm not sure how anyone managed to build it before without this. https://bugzilla.gnome.org/show_bug.cgi?id=696730 Reviewed-by: Robert Bragg <robert@linux.intel.com>
* configure: Add a minimum required version for the wayland packageNeil Roberts2013-03-211-11/+9
| | | | | | | | | | | Previously Cogl would accept any version of Wayland when building the Wayland backend. Seeing as there is now a stable API we might as well specify that we require at least version 1.0.0. This is now also mentioned in the README. This patch also changes it to use PKG_CHECK_MODULES instead of PKG_CHECK_EXISTS because it does need to abort if it fails and it shouldn't be checking it silently. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* cogland: Update to the Wayland 1.0 APINeil Roberts2013-03-211-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates Cogland example compositor to use the stable Wayland 1.0 API. • When the client attaches a new buffer to a surface it is now added to a struct contaning pending the state instead of immediately switching to the new buffer. This state is then flushed when the surface is committed. • The frame callbacks are now queued in a pending list and only added to the compositor's main list when the surface is committed. Both lists are now a wl_list instead of a GQueue because it makes it easier to remove the callback without knowing which list it is in. • When the buffer is destroyed for a surface the resource for the buffer is now sent a release event. • It now flushes the clients in the prepare for the for the Wayland event GSource. This is part of the multi-threaded API in this Wayland patch: http://cgit.freedesktop.org/wayland/wayland/commit/?id=53d24713a31d59 • Implements a dummy wl_region interface. The only interfaces that actually use regions (the opaque and input regions) are ignored but we need the interface to create a resource. • Most the of the SHM interface is now implemented directly in libwayland-server except that it still needs to copy the data to the subregion of the texture when the damage region is committed. • The callback list for when a resource is destroyed has been unified into a generic wl_signal implementation so the signature for the functions has been changed. http://cgit.freedesktop.org/wayland/wayland/commit/?h=6802eaa68af9022 • The wl_buffer struct no longer has a user_data parameter so we can't attach our own CoglandBuffer data to it. Instead the CoglandSurface now just keeps track of the wl_buffer directly. • The Cogland example is now unconditionally built instead of checking the Wayland version number in the configure script. It looks like this check was broken anyway because it was checking the version of the gbm package rather than a Wayland package. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* cogl-gst: remove experimental "HW Decode" codeRobert Bragg2013-03-211-7/+0
| | | | | | | | | | | | | | The experimental HW decode path was adapted from clutter-gst based on some experimental gstreamer api. This path was disabled by upstream gstreamer developers back in september last year due to instabilities. Without understanding how the experimental api is implemented it seems rather strange to be plucking out the GL handle of a cogl texture and passing that to some unknown gstreamer code which would presumably somehow have to use the same GL context as Cogl to be able to do something with that texture. For now we can strip all of this unused code and it would be easy enough to re-instate later if it's useful. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Include CoglGstPlamena Manolova2013-03-191-0/+54
| | | | | | | | | | | | CoglGst is a GStreamer integration library that facilitates video playback using the Cogl API. It works by retrieving each video frame from the GStreamer pipeline and attaching it to a Cogl pipeline in the form of a Cogl texture along with possible color model conversion shaders. The pipeline is then retrieved by the user during each draw. An example use of the CoglGst API is included in the examples directory. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Add CoglOutput and track for the GLX backendOwen W. Taylor2013-01-301-1/+2
| | | | | | | | | | | | | The CoglOutput object represents one output such as a monitor or laptop panel, with information about attributes of the output such as the position of the output within the global coordinate space, and the refresh rate. We don't yet publically export the ability to get output information but we track it for the GLX backend, where we'll use it to track the refresh rate. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* build: only build cogland with wayland-server 0.85Robert Bragg2013-01-211-1/+14
| | | | | | | This ensures we only try to build cogland if we have wayland-server 0.85.x since the api is incompatible with later versions. (cherry picked from commit ab0085596739eec4d762cb7c7531d0510ee076bd)
* doc: Fix cross-referencing with glib and gdk-pixbufDamien Lespiau2012-12-311-0/+5
| | | | | The libraries prefixes where never set in the configure script and GDKPIXBUF_PREFIX had a typo.
* build: Use -Wundef when possibleDamien Lespiau2012-12-291-1/+1
| | | | | This allows us to catch the use of undefined macros (that default to 0) in preprocessor conditionals.
* build: Exclude COGL_DEFINES and COGL_GL_HEADER_INCLUDES from MakefilesDamien Lespiau2012-12-291-1/+2
| | | | | | | | | | | | | | | | | | | | Some variables (notably multiline ones) are not really supposed to be substituted by automake. Let's take COGL_DEFINES for instance, you get: COGL_DEFINES = #define COGL_HAS_GLIB_SUPPORT #define COGL_HAS_GTYPE_SUPPORT #define COGL_HAS_GL #define CLUTTER_COGL_HAS_GL #define COGL_HAS_GLX_SUPPORT #define COGL_HAS_SDL ... This only works because the '#' character makes it look like a comment and COGL_DEFINES becomes an empty variable Automake allows to exclude variables from the list of substitutions, let's use it for those two.
* Fixes for --disable-glibNeil Roberts2012-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | This fixes some problems which were stopping --disable-glib from working properly: • A lot of the public headers were including glib.h. This shouldn't be necessary because the API doesn't expose any glib types. Otherwise any apps would require glib in order to get the header. • The public headers were using G_BEGIN_DECLS. There is now a replacement macro called COGL_BEGIN_DECLS which is defined in cogl-types.h. • A similar fix has been done for G_GNUC_NULL_TERMINATED and G_GNUC_DEPRECATED. • The CFLAGS were not including $(builddir)/deps/glib which was preventing it finding the generated glibconfig.h when building out of tree. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* configure: Don't allow --enable-gdk-pixbuf with --disable-glibNeil Roberts2012-11-261-71/+70
| | | | | | | | | | | | | | | | | | | | | | The GDK pixbuf support requires being able to propagate errors from GDKPixbuf as GErrors. This won't work if we are using the builtin version of GLib because any attempt to call g_error_free from within Cogl will use the internal version which will free the error using the wrong slice allocator. It probably doesn't make much sense to build without glib but with gdk-pixbuf so there's not much point in trying to work around this situation. Previously if you specified --enable-gdk-pixbuf but gdk-pixbuf was not available it would silently disable it. This pach also fixes it so that it will report an error in that case. If --enable-gdk-pixbuf is not specified it will now default to enabling it only if both glib is enabled and gdk-pixbuf is available. This patch looks slightly longer than it ought to be because it moves the check for glib up to above the descisions about the image backend. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* build: Create the libtool file early as it's used by AS_GLIBCONFIGDamien Lespiau2012-09-241-0/+3
| | | | | | | glib's configure.ac uses libtool to determine the extension of shared libraries. So let's generate the libtool file early in configure. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Build: Add a --enable-standalone optionDamien Lespiau2012-09-241-0/+20
| | | | | | | This option will generate a libcogl2 DSO that depends on the least possible external libraries. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* build: Allow to build cogl without an external glib dependencyDamien Lespiau2012-09-241-59/+84
| | | | | | | | | | | | This commit pushes --disable-glib to the extreme of embedding the par of glib cogl depends on in tree to be able to generate a DSO that does not depend on an external glib. To do so, it: - keeps a lot of glib's configure.ac in as-glibconfig.m4 - pulls the code cogl depends on and the necessary dependencies Reviewed-by: Robert Bragg <robert@linux.intel.com>
* build: Use the correct variable to indicate of cogl-gles2 will be builtDamien Lespiau2012-09-241-1/+1
| | | | | | Instead of using the variable to use in Makefile.ams. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* build: Indicate if cogl is build with i18n supportDamien Lespiau2012-09-241-0/+1
| | | | | | | | --disable-nls can be used to compile cogl without i18n support. Let's indicate the i18n enabling status so curious people can deduce it can be compiled out. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* build: Move the compiler checks and libtool initialization upDamien Lespiau2012-09-241-29/+27
| | | | | | | | | | | | | | It seems logical to first look for the compiler and then run the rest of configure script (which will use the compiler with small snippets). Same goes for the libtool initializaton, you might as well do it not too far from the automake one. This also happens to be preparatory work to compile cogl with an in-tree copy of some glib files as the glib's configure script needs those checks early. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* build: Bump the glib dependency to 2.32Damien Lespiau2012-09-131-1/+1
| | | | | | | As far as I can tell the --symbol-prefix option wasn't there before glib 2.32's glib-mkenums. So cogl effectively depends on glib 2.32. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Make the default driver selectable at configure timeSjoerd Simons2012-08-301-1/+14
| | | | | | | | | When building COGL with multiple backends it can be useful to force a default driver to be selected. For example while for Debian we do want to build the GL renderer on ARM, GLESv2 is much more suitable as the default renderer on that platform. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* kms: Update to latest gbm apiRobert Bragg2012-08-301-0/+9
| | | | | | | | | | | | | gbm_bo_get_pitch was renamed to gbm_bo_get_stride to be consistent with how the terms pitch and stride are used throughout mesa. This updates the Cogl backend to use the new gbm_bo_get_stride name. For compatibility with previous version of libgbm we now explicitly check the version of libgbm in configure.ac and expose COGL_GBM_{MAJOR,MINOR,MICRO} defines to the code so we can conditionally use the older gbm_bo_get_pitch() name with older versions. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* test(1) uses '=' to test if strings are identicalPatrick Welche2012-08-281-5/+5
| | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=682340 Reviewed-by: Neil Roberts <neil@linux.intel.com>
* build: remove unneeded check for libdrmAntoine Jacoutot2012-08-151-8/+0
| | | | | | | | | | Since fallback for vblank wait via manual drm ioctl was removed in commit 3bc70687ac92b237febeb0f369394e8e6bea9d53 there is no need to check for libdrm anymore. https://bugzilla.gnome.org/show_bug.cgi?id=678316 Reviewed-by: Robert Bragg <robert@linux.intel.com>
* configure: use AC_GNU_SOURCERobert Bragg2012-08-151-0/+1
| | | | | | | | This adds the AC_GNU_SOURCE macro to configure.ac to ensure _GNU_SOURCE is defined while compiling Cogl. This is required to use memmem for example. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Add a wrapper for 'memmem'Neil Roberts2012-08-091-0/+3
| | | | | | | | | | | | | memmem is a GNU libc extension that works like strstr except that the size of the needle and the haystack are passed into the function instead of using null-terminated strings. This patch adds a wrapper function called 'cogl_util_memmem' so that we can use this function. There is a configure check and if the function is not available then a fallback implementation will be used. Otherwise cogl_util_memmem is just defined to memmem. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Avoid including the EGL headers from the public Cogl headersTomeu Vizoso2012-07-131-0/+1
| | | | | | Otherwise, X11 identifiers may leak and cause havoc in big applications Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Add an SDL2 winsysNeil Roberts2012-06-201-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an alternate version of the SDL winsys using the SDL 2 API. The two versions are mutually exclusive and share the same CoglWinsysID. Version 2 of SDL fits a little bit better with Cogl because it supports multiple windows and the video subsystem can be initialised entirely independently of the rest of the subsystems. The SDL2 winsys creates an invisible dummy window in order to bind the GL context after creating the Cogl display. This is similar to how the X11 winsys's work. SDL2 seems to support compiling with support for both GL and GLES. However there doesn't seem to be a way to select between the two backends outside of SDL. In fact if you do compile them both in it seems to break down because it will always try to use the window system functions from the GLES backend because those are filled in second in the vtable. However when creating the window it will always prefer to use the GL function to choose a visual. This function gets confused because the GL backend has not been initialised at that point. The Cogl backend therefore just leaves it up to SDL to pick a sensible backend. It will then verify that it picked a GL library which matches the Cogl driver by checking the string from glGetString(GL_VERSION). Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Fix disabling debuggingNeil Roberts2012-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | When --disable-debug is passed to the configure script it was actually still defining COGL_ENABLE_DEBUG so very little would end up being disabled. If COGL_ENABLE_DEBUG actually got defined it would also fail to compile because _cogl_debug_instances and COGL_DEBUG_N_LONGS from cogl-debug.h were only defined if debugging is enabled but they are used regardless. This patch also makes it so that the _COGL_RETURN_IF_FAIL family of macros that are used when glib support is disabled are now disabled if debugging is disabled. When the glib macros are used they are already disabled because we additionally define G_DISABLE_CHECKS. 'COGL_HANDLE_DEBUG' has been removed from the list of defines passed when debugging is enabled because CoglHandle has already been removed and it is not used anywhere in the code. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Adds libcogl-gles2 frontend GLES2 apiRobert Bragg2012-05-171-1/+25
| | | | | | | | | | This adds a library that can be used instead of libGLESv2.so to provide symbols for the GLES 2.0 api. This can be used for convenience when using the cogl_gles2_context_ api since you don't need to manually go through a CoglGLES2Vtable when calling the gles2 api so it should be easier to port existing gles2 code to integrate with Cogl. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Fix Visual C++ buildChun-wei Fan2012-05-151-0/+2
| | | | | | | | | | | | | | | | | -Create a pre-defined cogl/cogl-gl-header.h(.win32) that is to be used on any Windows builds, and adapt the MSVC build process to set up and use that file. -Fix up glib-mkenums code generation .bat file that is generated during "make"/"make dist", like the autotools-based builds. -Since cogl/cogl-defines.h now contain versionioning info, and it no longer directly includes the GL headers, update the pre-configured cogl-defines.h[.win32|.win32_SDL] and use autotools to fill in the versioning info during "make"/"make dist". -Fix up cogl/cogl-pango.rc.in so that they reflect the cogl-2.x versioning stuff correctly and versioning info can be filled in correctly during "make"/"make dist" Reviewed-by: Robert Bragg <robert@linux.intel.com>
* Add support for the WebOS version of SDLNeil Roberts2012-05-081-24/+44
| | | | | | | | | | | The stock 1.2.x version of SDL only supports regular OpenGL. The version on WebOS is specially patched to add some extra API to request a GLES1 or GLES2 context. This patch adds a configure check to detect when Cogl is being built with the patched version of SDL. In that case it will additionally allow the gles1 and gles2 drivers and set the right video mode attributes to get the corresponding context. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* tests: Adds journal micro benchmarkRobert Bragg2012-04-241-0/+1
| | | | | | | This makes the test-cogl-perf test from clutter into a standalone Cogl benchmark. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* configure: Fix the check for _Static_assertNeil Roberts2012-04-231-10/+7
| | | | | | | | | | | | | | | | | The check for whether the compiler supports _Static_assert didn't work properly because the AC_TRY_COMPILE function puts the source definition in its own main function. The test therefore ends up declaring a nested main function which GCC allows. If _Static_assert isn't available then it just looks like an implicit declaration of a function which only causes a warning in GCC so it would still compile. This patch changes it to use AC_COMPILE_IFELSE instead. This macro makes it possible to specify the complete source code so _Static_assert can be called from the global scope. AC_LANG_PROGRAM is used to generate the program. For extra aesthetics it now also generates a 'checking for...' message while the script is running. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* namespace symbols output by glib-mkenumsRobert Bragg2012-04-181-0/+1
| | | | | | | | | | | | | | This puts all the _get_type() symbols output by glib-mkenums into a cogl_gtype_ namespace and also ensures the symbols aren't generated if Cogl is built with --disable-glib. This is consistent with the cogl_gtype_matrix_get_type() symbol we expose. By namespacing the GType integration api that also means we can choose to use api like cogl_texture_get_type() for queries more directly related to the core Cogl api, such as querying whether a texture is a CoglTexture2D vs Texture3D or SubTexture etc.
* Add _COGL_STATIC_ASSERT macroRobert Bragg2012-04-181-0/+13
| | | | | | | | | This adds a _COGL_STATIC_ASSERT macro that can be used for compile time assertions in C code. If supported by the compiler this macro uses _Static_assert so that a message can be printed out if the assertion fails. Reviewed-by: Neil Roberts <neil@linux.intel.com>
* Don't include any GL header from the public GL headersNeil Roberts2012-04-161-0/+1
| | | | | | | | | | | | | | | | | | | This splits the GL header inclusion from cogl-defines.h into a separate headear called cogl-gl-header.h which we will only include internally. That way we don't leak GL declarations out of our public headers. The texture functions that were using GLenum and GLuint in the public header have now changed to just use unsigned int. Note however that if an EGL winsys is enabled then it will still publicly include an EGL header. This is a bit more awkward to fix because we have public API which returns an EGLDisplay and we can't determine what type that is. There is also a conformance test which just verifies that no GL header has been included while compiling. The test isn't added to test-conform-main because it doesn't actually test anything at runtime. Reviewed-by: Robert Bragg <robert@linux.intel.com>