Merge "evas: enable dynamic flag for zero copy texture upload in ector / Bind to...
authorWonsik Jung <sidein@samsung.com>
Thu, 28 Apr 2016 01:28:39 +0000 (18:28 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 28 Apr 2016 01:28:39 +0000 (18:28 -0700)
1  2 
src/modules/evas/engines/gl_common/evas_gl_common.h
src/modules/evas/engines/gl_common/evas_gl_context.c

@@@ -1147,11 -1151,12 +1147,11 @@@ evas_gl_common_context_newframe(Evas_En
  
     glEnableVertexAttribArray(SHAD_VERTEX);
     glEnableVertexAttribArray(SHAD_COLOR);
 -   if (gc->state.current.cur_prog == PRG_INVALID)
 -      glUseProgram(gc->shared->shader[0].prog);
 -   else glUseProgram(gc->state.current.cur_prog);
 +   if (gc->state.current.prog != PRG_INVALID)
 +     glUseProgram(gc->state.current.prog->prog);
  
     glActiveTexture(GL_TEXTURE0);
-    glBindTexture(gc->pipe[0].shader.tex_target, gc->pipe[0].shader.cur_tex);
+    evas_gl_common_texture_shared_back(gc, NULL);
  
     _evas_gl_common_viewport_set(gc,1);
  }