On 20/05/13 18:31, Rafael Antognolli - Enlightenment Git wrote:
> antognolli pushed a commit to branch master.
>
> commit 99be49551e59c99c13192dd7d454d8d2dbcd42ba
> Author: Rafael Antognolli <rafael.antogno...@intel.com>
> Date:   Mon May 20 14:19:45 2013 -0300
>
>      evas/gl: Use GL_FRAMEBUFFER_BINDING, which is available on both.
>      
>      Instead of a define from GL_DRAW_FRAMEBUFFER_BINDING to the above one,
>      just use it directly since it's available on gles and full gl.
> ---
>   src/modules/evas/engines/gl_common/evas_gl_texture.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c 
> b/src/modules/evas/engines/gl_common/evas_gl_texture.c
> index 664ee3d..f05a4e8 100644
> --- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
> +++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
> @@ -383,9 +383,6 @@ _pool_tex_render_new(Evas_Engine_GL_Context *gc, int w, 
> int h, int intformat, in
>   # ifndef GL_COLOR_ATTACHMENT0
>   #  define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_OES
>   # endif
> -# ifndef GL_DRAW_FRAMEBUFFER_BINDING
> -#  define GL_DRAW_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING
> -# endif
>   #else
>   # ifndef GL_FRAMEBUFFER
>   #  define GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
> @@ -399,7 +396,7 @@ _pool_tex_render_new(Evas_Engine_GL_Context *gc, int w, 
> int h, int intformat, in
>   
>      _print_tex_count();
>   
> -   glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &fnum);
> +   glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fnum);
>      glGenTextures(1, &(pt->texture));
>      GLERR(__FUNCTION__, __FILE__, __LINE__, "");
>      glBindTexture(GL_TEXTURE_2D, pt->texture);
>

Works for me ;) I pushed the canvas pointer stuff we talked about 
already also ;)

dh


------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to