Merge lp:~afrantzis/clutk/gles2-shaders.alf-fixes into lp:~jammy-zhou/clutk/gles2-shaders.hacky
Proposed by
Alexandros Frantzis
Status: | Merged |
---|---|
Approved by: | Jammy Zhou |
Approved revision: | 274 |
Merged at revision: | 272 |
Proposed branch: | lp:~afrantzis/clutk/gles2-shaders.alf-fixes |
Merge into: | lp:~jammy-zhou/clutk/gles2-shaders.hacky |
Diff against target: |
128 lines (+7/-13) 3 files modified
clutk/ctk-gfx-private.c (+0/-12) clutk/ctk-gfx-private.h (+6/-0) configure.ac (+1/-1) |
To merge this branch: | bzr merge lp:~afrantzis/clutk/gles2-shaders.alf-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jammy Zhou | Approve | ||
Review via email: mp+36046@code.launchpad.net |
To post a comment you must log in.
Hi Alexandros,
clutk/ctk- gfx-private. c:
yes, "CHECKGL( glEnable (GL_TEXTURE_2D) );" can be removed, because
GL_TEXTURE_2D is always enabled by default in gles2.
clutk/ctk- gfx-private. h:
I don't think we need to include <GLES2/gl2.h> or <GL/gl.h> here. Any reason
for this?
configure.ac:
Good catch. :)
Regards,
Jammy
2010/9/21 Alexandros Frantzis <email address hidden>
> Alexandros Frantzis has proposed merging /code.launchpad .net/~afrantzis /clutk/ gles2-shaders. alf-fixes/ +merge/ 36046<https:/ /code.launchpad .net/%7Eafrantz is/clutk/ gles2-shaders. alf-fixes/ +merge/ 36046> ctk-gfx- private. c' gfx-private. c 2010-09-14 06:57:48 +0000 gfx-private. c 2010-09-20 18:31:13 +0000 (GL_TEXTURE0) ); GL_TEXTURE_ 2D, texid) ); (GL_TEXTURE0) ); GL_TEXTURE_ 2D, texid target_ get_color_ buffer_ ogl_id( rt)*/) ); (GL_TEXTURE0) ); GL_TEXTURE_ 2D, target_ get_color_ buffer_ ogl_id( rt)) ); (GL_TEXTURE0) ); GL_TEXTURE_ 2D, base_texid) ); (GL_TEXTURE1) ); GL_TEXTURE_ 2D, texid) ); (GL_TEXTURE0) ); GL_TEXTURE_ 2D, target_ get_color_ buffer_ ogl_id( rt_src) ) ); (GL_TEXTURE0) ); GL_TEXTURE_ 2D, tex_id) ); (GL_TEXTURE1) ); GL_TEXTURE_ 2D, 0) ) GL_TEXTURE_ 2D, tex_mask_id) ); g_shMultipassBl ur->shprog) );
> lp:~afrantzis/clutk/gles2-shaders.alf-fixes into
> lp:~jammy-zhou/clutk/gles2-shaders.hacky.
>
> Requested reviews:
> Jammy Zhou (jammy-zhou)
>
> --
>
> https:/
> You are requested to review the proposed merge of
> lp:~afrantzis/clutk/gles2-shaders.alf-fixes into
> lp:~jammy-zhou/clutk/gles2-shaders.hacky.
>
> === modified file 'clutk/
> --- clutk/ctk-
> +++ clutk/ctk-
> @@ -186,7 +186,6 @@
> /* Set texture 0 environment mode */
> {
> CHECKGL( glActiveTexture
> - CHECKGL( glEnable (GL_TEXTURE_2D) );
> CHECKGL( glBindTexture(
> }
>
> @@ -258,7 +257,6 @@
> /* Set texture 0 environment mode */
> {
> CHECKGL( glActiveTexture
> - CHECKGL( glEnable (GL_TEXTURE_2D) );
> CHECKGL( glBindTexture(
> /*ctk_render_
> }
>
> @@ -344,7 +342,6 @@
> /* Set texture 0 environment mode */
> {
> CHECKGL( glActiveTexture
> - CHECKGL( glEnable (GL_TEXTURE_2D) );
> CHECKGL( glBindTexture(
> ctk_render_
> }
>
> @@ -439,14 +436,12 @@
> /* Set texture 0 environment mode */
> {
> CHECKGL( glActiveTexture
> - CHECKGL( glEnable (GL_TEXTURE_2D) );
> CHECKGL( glBindTexture(
> }
>
> /* Set texture 1 environment mode */
> {
> CHECKGL( glActiveTexture
> - CHECKGL( glEnable (GL_TEXTURE_2D) );
> CHECKGL( glBindTexture(
> }
>
> @@ -525,7 +520,6 @@
> /* Set texture 0 environment mode */
> {
> CHECKGL( glActiveTexture
> - CHECKGL( glEnable (GL_TEXTURE_2D) );
> CHECKGL( glBindTexture(
> ctk_render_
> }
>
> @@ -654,7 +648,6 @@
> /* Set texture 0 environment mode */
> {
> CHECKGL( glActiveTexture
> - CHECKGL( glEnable (GL_TEXTURE_2D) );
> CHECKGL( glBindTexture(
> }
>
> @@ -662,7 +655,6 @@
> {
> CHECKGL( glActiveTexture
> CHECKGL( glBindTexture(
> - CHECKGL( glEnable (GL_TEXTURE_2D) );
> CHECKGL( glBindTexture(
> }
>
> @@ -762,7 +754,6 @@
> CHECKGL( glUseProgram(
>
> CHECKGL (glActiveTexture (GL_TEXTURE0));
> - CHECKGL( glEnable (GL_TEXTURE_2D) );
> CHECKGL (glBindTexture (GL_TEXTURE_2D, pSrcTexture))...