summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-12-03 12:08:03 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-12-03 16:57:50 +0900
commitef36e0d8877bcc760c7981d3061f551ff05f4e29 (patch)
treeab9b5389e36d97b5bbce02e12c42b9b27540bca8
parent0514cbc1a3c86a86c2abcf39958f562e5bc2e31b (diff)
Evas GL: Clarify doc about Evas_GL_API struct version
-rw-r--r--src/lib/evas/Evas_GL.h35
1 files changed, 29 insertions, 6 deletions
diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
index 302d72c..c3ce92a 100644
--- a/src/lib/evas/Evas_GL.h
+++ b/src/lib/evas/Evas_GL.h
@@ -3498,9 +3498,15 @@ typedef unsigned long long EvasGLTime;
3498/** @} */ 3498/** @} */
3499 3499
3500 3500
3501/* Version 1: OpenGLES 2.0 + extensions only 3501/**
3502 * Version 2: OpenGLES 1.0 + extensions 3502 * @brief Defines the version of the API structure.
3503 * Version 3: wayland extensions 3503 *
3504 * This helps applications know at runtime whether a function pointer exists
3505 * or not.
3506 *
3507 * Version 1: GLES 2.0 + GLES2 extensions only
3508 * Version 2: GLES 2.0 + GLES2 extensions + GLES1 + GLES1.1 extensions
3509 * Version 3: [version 2] + Wayland extensions
3504 */ 3510 */
3505#define EVAS_GL_API_VERSION 3 3511#define EVAS_GL_API_VERSION 3
3506 3512
@@ -3791,8 +3797,12 @@ struct _Evas_GL_API
3791 */ 3797 */
3792 void (*evasglDestroyImage) (EvasGLImage image); 3798 void (*evasglDestroyImage) (EvasGLImage image);
3793 3799
3800
3801
3802 // ---------------------------------------------------------------------- //
3794 /* Evas_GL_API version 2: */ 3803 /* Evas_GL_API version 2: */
3795 3804
3805
3796 /** 3806 /**
3797 * @anchor evasglCreateImageForContext 3807 * @anchor evasglCreateImageForContext
3798 * @brief Create an EvasGLImage for a given context. 3808 * @brief Create an EvasGLImage for a given context.
@@ -3817,6 +3827,8 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
3817 * @li @c EVAS_GL_NATIVE_SURFACE_TIZEN (Tizen platform only):<br/> 3827 * @li @c EVAS_GL_NATIVE_SURFACE_TIZEN (Tizen platform only):<br/>
3818 * Requires the @c EVAS_GL_TIZEN_image_native_surface extension. 3828 * Requires the @c EVAS_GL_TIZEN_image_native_surface extension.
3819 * 3829 *
3830 * @note Evas_GL_API must have version 2 or more.
3831 *
3820 * @since 1.12 3832 * @since 1.12
3821 */ 3833 */
3822 EvasGLImage (*evasglCreateImageForContext) (Evas_GL *evas_gl, Evas_GL_Context *ctx, int target, void* buffer, const int* attrib_list) EINA_WARN_UNUSED_RESULT; 3834 EvasGLImage (*evasglCreateImageForContext) (Evas_GL *evas_gl, Evas_GL_Context *ctx, int target, void* buffer, const int* attrib_list) EINA_WARN_UNUSED_RESULT;
@@ -3826,7 +3838,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
3826 /** 3838 /**
3827 * @name OpenGL-ES 1.1 3839 * @name OpenGL-ES 1.1
3828 * 3840 *
3829 * Evas_GL_API version 2. 3841 * Evas_GL_API version 2 or more.
3830 * 3842 *
3831 * The following functions are some of the standard OpenGL-ES 1.0 functions, 3843 * The following functions are some of the standard OpenGL-ES 1.0 functions,
3832 * that are not also present in the @ref gles2 "OpenGL-ES 2.0 APIs". 3844 * that are not also present in the @ref gles2 "OpenGL-ES 2.0 APIs".
@@ -3927,7 +3939,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
3927 /** 3939 /**
3928 * @name OpenGL-ES 1.1 extensions 3940 * @name OpenGL-ES 1.1 extensions
3929 * 3941 *
3930 * Evas_GL_API version 2. 3942 * Evas_GL_API version 2 or more.
3931 * 3943 *
3932 * OpenGL-ES 1.1 specifies a set of extensions on top of OpenGL-ES 1.0. 3944 * OpenGL-ES 1.1 specifies a set of extensions on top of OpenGL-ES 1.0.
3933 * When available, Evas GL will expose these extensions with the following 3945 * When available, Evas GL will expose these extensions with the following
@@ -4124,8 +4136,16 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
4124 int (*evasglWaitSync) (Evas_GL *evas_gl, EvasGLSync sync, int flags); 4136 int (*evasglWaitSync) (Evas_GL *evas_gl, EvasGLSync sync, int flags);
4125 /** @} */ 4137 /** @} */
4126 4138
4139
4140
4141 // ---------------------------------------------------------------------- //
4142 /* Evas_GL_API version 3: */
4143
4127 /** 4144 /**
4128 * @name Evas GL Wayland functions 4145 * @name Evas GL Wayland functions
4146 *
4147 * Evas_GL_API version 3 or more.
4148 *
4129 * @since 1.13 4149 * @since 1.13
4130 * @{ */ 4150 * @{ */
4131 /** 4151 /**
@@ -4145,7 +4165,10 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
4145 Eina_Bool (*evasglQueryWaylandBuffer) (Evas_GL *evas_gl, void *buffer, int attribute, int *value); 4165 Eina_Bool (*evasglQueryWaylandBuffer) (Evas_GL *evas_gl, void *buffer, int attribute, int *value);
4146 /** @} */ 4166 /** @} */
4147 4167
4148 /* future calls will be added down here for expansion */ 4168 /* Future calls will be added down here for expansion, when adding
4169 * new APIs here, please bump the struct version number (together with
4170 * the EFL version bump).
4171 */
4149}; 4172};
4150 4173
4151 4174