summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/evas/Evas.h8
-rw-r--r--src/lib/evas/Evas_GL.h23
-rw-r--r--src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c2
3 files changed, 17 insertions, 16 deletions
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index a602397..d25847c 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -99,7 +99,7 @@
99 99
100 For example, if in the above scene, the windowing system requires the 100 For example, if in the above scene, the windowing system requires the
101 application to redraw the area from 0, 0 to 50, 50 (also referred as 101 application to redraw the area from 0, 0 to 50, 50 (also referred as
102 "expose event"), then the programmer must calculate manually the 102 "expose event"), then the programmer must manually calculate the
103 updates and repaint it again: 103 updates and repaint it again:
104 104
105 @verbatim 105 @verbatim
@@ -126,8 +126,8 @@
126 100 pixels is around 40000 useless writes! You could write 126 100 pixels is around 40000 useless writes! You could write
127 code to calculate the overlapping areas and avoid painting then, but 127 code to calculate the overlapping areas and avoid painting then, but
128 then it should be mixed with the "expose event" handling mentioned 128 then it should be mixed with the "expose event" handling mentioned
129 above and you quickly realize that the initially simpler method became 129 above and you quickly realize that the initially simpler method becomes
130 really complex. 130 very complex.
131 131
132 Evas is a structural system in which the programmer creates and 132 Evas is a structural system in which the programmer creates and
133 manages display objects and their properties, and as a result of this 133 manages display objects and their properties, and as a result of this
@@ -165,7 +165,7 @@
165 This lets you think in a more natural way when dealing with 165 This lets you think in a more natural way when dealing with
166 a display, and saves time and effort of working out how to load and 166 a display, and saves time and effort of working out how to load and
167 display images, render given the current display system, and so on. Since 167 display images, render given the current display system, and so on. Since
168 Evas also is portable across different display systems, this also 168 Evas is also portable across different display systems, this also
169 gives you the ability to have their code ported and 169 gives you the ability to have their code ported and
170 displayed on different display systems with very little work. 170 displayed on different display systems with very little work.
171 171
diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
index a48882b..abc03ef 100644
--- a/src/lib/evas/Evas_GL.h
+++ b/src/lib/evas/Evas_GL.h
@@ -924,7 +924,7 @@ EAPI Evas_GL_Surface *evas_gl_current_surface_get (Evas_GL *evas_gl) EIN
924 * @param[out] context Optional return value for the current context 924 * @param[out] context Optional return value for the current context
925 * @param[out] surface Optional return value for the current surface 925 * @param[out] surface Optional return value for the current surface
926 * 926 *
927 * @return The current Evas GL, ie. the last Evas GL passed to evas_gl_make_current 927 * @return The current Evas GL, i.e. the last Evas GL passed to evas_gl_make_current
928 * 928 *
929 * @see evas_gl_make_current 929 * @see evas_gl_make_current
930 * 930 *
@@ -4798,7 +4798,7 @@ typedef unsigned long long EvasGLTime;
4798/* @brief Attribute list terminator 4798/* @brief Attribute list terminator
4799 * 0 is also accepted as an attribute terminator. 4799 * 0 is also accepted as an attribute terminator.
4800 * Evas_GL will ensure that the attribute list is always properly terminated 4800 * Evas_GL will ensure that the attribute list is always properly terminated
4801 * (eg. using EGL_NONE for EGL backends) and the values are supported by the 4801 * (e.g. using EGL_NONE for EGL backends) and the values are supported by the
4802 * backends. 4802 * backends.
4803 */ 4803 */
4804#define EVAS_GL_NONE 0x3038 4804#define EVAS_GL_NONE 0x3038
@@ -4847,7 +4847,7 @@ typedef unsigned long long EvasGLTime;
4847 * The values are the same as EGL error codes - @c EGL_SUCCESS. 4847 * The values are the same as EGL error codes - @c EGL_SUCCESS.
4848 * 4848 *
4849 * Some of the values may be set directly by Evas GL when an obvious error was 4849 * Some of the values may be set directly by Evas GL when an obvious error was
4850 * detected (eg. @c NULL pointers or invalid dimensions), otherwise Evas GL will 4850 * detected (e.g. @c NULL pointers or invalid dimensions), otherwise Evas GL will
4851 * call the backend's GetError() function and translate to a valid @c EVAS_GL_ 4851 * call the backend's GetError() function and translate to a valid @c EVAS_GL_
4852 * error code. 4852 * error code.
4853 * 4853 *
@@ -5214,8 +5214,9 @@ struct _Evas_GL_API
5214 * 5214 *
5215 * Requires the @c EVAS_GL_image extension. 5215 * Requires the @c EVAS_GL_image extension.
5216 * 5216 *
5217 * @note Unlike in pure EGL, the display pointer needs not be passed in, as 5217 * @note Unlike in pure EGL, the display pointer doesn't need to be
5218 * Evas GL will use the same EGLDisplay as used in the create function. 5218 * passed in, as Evas GL will use the same EGLDisplay as used in the
5219 * create function.
5219 */ 5220 */
5220 void (*evasglDestroyImage) (EvasGLImage image); 5221 void (*evasglDestroyImage) (EvasGLImage image);
5221 /** @} */ 5222 /** @} */
@@ -5248,7 +5249,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5248 * @li @c EVAS_GL_NATIVE_SURFACE_TIZEN (Tizen platform only):<br/> 5249 * @li @c EVAS_GL_NATIVE_SURFACE_TIZEN (Tizen platform only):<br/>
5249 * Requires the @c EVAS_GL_TIZEN_image_native_surface extension. 5250 * Requires the @c EVAS_GL_TIZEN_image_native_surface extension.
5250 * 5251 *
5251 * @note Evas_GL_API must have version 2 or more. 5252 * @note Evas_GL_API must have version 2 or higher.
5252 * 5253 *
5253 * @since 1.12 5254 * @since 1.12
5254 */ 5255 */
@@ -5259,7 +5260,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5259 /** 5260 /**
5260 * @name OpenGL-ES 1.1 5261 * @name OpenGL-ES 1.1
5261 * 5262 *
5262 * Evas_GL_API version 2 or more. 5263 * Evas_GL_API version 2 or higher.
5263 * 5264 *
5264 * The following functions are some of the standard OpenGL-ES 1.0 functions, 5265 * The following functions are some of the standard OpenGL-ES 1.0 functions,
5265 * that are not also present in the @ref gles2 "OpenGL-ES 2.0 APIs". 5266 * that are not also present in the @ref gles2 "OpenGL-ES 2.0 APIs".
@@ -5360,7 +5361,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5360 /** 5361 /**
5361 * @name OpenGL-ES 1.1 extensions 5362 * @name OpenGL-ES 1.1 extensions
5362 * 5363 *
5363 * Evas_GL_API version 2 or more. 5364 * Evas_GL_API version 2 or higher.
5364 * 5365 *
5365 * OpenGL-ES 1.1 specifies a set of extensions on top of OpenGL-ES 1.0. 5366 * OpenGL-ES 1.1 specifies a set of extensions on top of OpenGL-ES 1.0.
5366 * When available, Evas GL will expose these extensions with the following 5367 * When available, Evas GL will expose these extensions with the following
@@ -5571,7 +5572,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5571 * @param sync A valid sync object created by evasglCreateSync 5572 * @param sync A valid sync object created by evasglCreateSync
5572 * @param timeout A relative timeout in nanoseconds 5573 * @param timeout A relative timeout in nanoseconds
5573 * 5574 *
5574 * @note Requires the extension @c EGL_KHR_reusable_sync, similarly to eglClientWaitSyncKHR. 5575 * @note Requires the extension @c EGL_KHR_reusable_sync, similar to eglClientWaitSyncKHR.
5575 * 5576 *
5576 * @return @c EVAS_GL_TIMEOUT_EXPIRED if the sync failed and timeout was reached, 5577 * @return @c EVAS_GL_TIMEOUT_EXPIRED if the sync failed and timeout was reached,
5577 * @c EVAS_GL_CONDITION_SATISFIED if the sync was signaled, 5578 * @c EVAS_GL_CONDITION_SATISFIED if the sync was signaled,
@@ -5587,7 +5588,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5587 * @param evas_gl The current Evas_GL connection 5588 * @param evas_gl The current Evas_GL connection
5588 * @param sync A valid sync object created by evasglCreateSync 5589 * @param sync A valid sync object created by evasglCreateSync
5589 * 5590 *
5590 * @note Requires the extension @c EGL_KHR_reusable_sync or @c EGL_KHR_wait_sync, similarly to eglSignalSyncKHR. 5591 * @note Requires the extension @c EGL_KHR_reusable_sync or @c EGL_KHR_wait_sync, similar to eglSignalSyncKHR.
5591 * 5592 *
5592 * @return @c EINA_TRUE in case of success, or 5593 * @return @c EINA_TRUE in case of success, or
5593 * @c EINA_FALSE in case of failure (in which case evas_gl_error_get() should return an error code) 5594 * @c EINA_FALSE in case of failure (in which case evas_gl_error_get() should return an error code)
@@ -5635,7 +5636,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5635 /** 5636 /**
5636 * @name Evas GL Wayland functions 5637 * @name Evas GL Wayland functions
5637 * 5638 *
5638 * Evas_GL_API version 3 or more. 5639 * Evas_GL_API version 3 or higher.
5639 * 5640 *
5640 * @since 1.13 5641 * @since 1.13
5641 * @{ */ 5642 * @{ */
diff --git a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
index 56b789d..a6ddee9 100644
--- a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
+++ b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
@@ -650,7 +650,7 @@ ecore_evas_sdl_new_internal(const char* name, int w, int h, int fullscreen,
650EAPI Ecore_Evas* 650EAPI Ecore_Evas*
651ecore_evas_sdl16_new_internal(const char* name EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int fullscreen EINA_UNUSED, int hwsurface EINA_UNUSED, int noframe EINA_UNUSED, int alpha EINA_UNUSED) 651ecore_evas_sdl16_new_internal(const char* name EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int fullscreen EINA_UNUSED, int hwsurface EINA_UNUSED, int noframe EINA_UNUSED, int alpha EINA_UNUSED)
652{ 652{
653 ERR("OUTCH !"); 653 ERR("OUCH !");
654 return NULL; 654 return NULL;
655} 655}
656 656