From dc3e41c3ded18ff14568604580d2681a7581f4c0 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Fri, 17 Jul 2015 11:50:21 +0900 Subject: [PATCH] Evas GL: Deprecate API evasglCreateImage Despite its ugly name, evasglCreateImageForContext should be used instead, as it's a proper API with evasgl and ctx passed in as arguments. --- src/lib/evas/Evas_GL.h | 3 ++- src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h index f25cd50..83890d5 100644 --- a/src/lib/evas/Evas_GL.h +++ b/src/lib/evas/Evas_GL.h @@ -4133,9 +4133,10 @@ struct _Evas_GL_API * @li @c EVAS_GL_NATIVE_SURFACE_TIZEN (Tizen platform only):
* Requires the @c EVAS_GL_TIZEN_image_native_surface extension. * + * @deprecated * @note Please consider using @ref evasglCreateImageForContext instead. */ - EvasGLImage (*evasglCreateImage) (int target, void* buffer, const int* attrib_list) EINA_WARN_UNUSED_RESULT; + EvasGLImage (*evasglCreateImage) (int target, void* buffer, const int* attrib_list) EINA_WARN_UNUSED_RESULT EINA_DEPRECATED; /** * @anchor evasglDestroyImage diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h b/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h index 79d5f19..5ab886d 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h +++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h @@ -1465,6 +1465,12 @@ _EVASGL_EXT_END() /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #ifdef GL_GLES #if _EVASGL_EXT_ENABLE_EGL + +// Disable warnings about deprecated functions here +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + _EVASGL_EXT_BEGIN(EGL_KHR_image_base) _EVASGL_EXT_DRVNAME(EGL_KHR_image_base) @@ -1496,6 +1502,9 @@ _EVASGL_EXT_BEGIN(EGL_KHR_image_base) _EVASGL_EXT_END() +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) +#pragma GCC diagnostic pop +#endif _EVASGL_EXT_BEGIN(EGL_KHR_image_pixmap) -- 2.7.4