[Cogl] [PATCH 1/4] cogl-texture-2d-private: Include egl-defines.h

Robert Bragg robert at sixbynine.org
Wed Aug 1 01:47:45 PDT 2012


This looks good to land to me.

Reviewed-by: Robert Bragg <robert at linux.intel.com>

thanks,
- Robert

On Tue, Jul 31, 2012 at 3:15 PM, Neil Roberts <neil at linux.intel.com> wrote:
> The cogl-texture-2d-private.h header checks for the presence of
> EGL_KHR_image_base before declaring
> _cogl_egl_texture_2d_new_from_image. This define will only be
> available if the EGL headers are included so we should make sure that
> happens. This was resulting in a warning complaining that the function
> was not previously declared.
> ---
>  cogl/cogl-texture-2d-private.h | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/cogl/cogl-texture-2d-private.h b/cogl/cogl-texture-2d-private.h
> index 96b59d6..34abaa9 100644
> --- a/cogl/cogl-texture-2d-private.h
> +++ b/cogl/cogl-texture-2d-private.h
> @@ -29,6 +29,10 @@
>  #include "cogl-texture-private.h"
>  #include "cogl-texture-2d.h"
>
> +#ifdef COGL_HAS_EGL_SUPPORT
> +#include "cogl-egl-defines.h"
> +#endif
> +
>  struct _CoglTexture2D
>  {
>    CoglTexture     _parent;
> --
> 1.7.11.3.g3c3efa5
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl


More information about the Cogl mailing list