diff -Nru clutk-0.3.32/aclocal.m4 clutk-0.3.32+0opengles2/aclocal.m4 --- clutk-0.3.32/aclocal.m4 2010-06-10 17:21:10.000000000 +0100 +++ clutk-0.3.32+0opengles2/aclocal.m4 2010-06-19 10:09:27.000000000 +0100 @@ -20,7 +20,6 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -48,10 +47,7 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -64,6 +60,7 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -72,31 +69,34 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) + m4_ifval([$2], [$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -138,17 +138,16 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + ifelse([$4], , [AC_MSG_ERROR(dnl [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -156,24 +155,25 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl - ]) +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])dnl - ]) +To get pkg-config, see .])], + [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + ifelse([$3], , :, [$3]) fi[]dnl ])# PKG_CHECK_MODULES diff -Nru clutk-0.3.32/build/autotools/Makefile.in clutk-0.3.32+0opengles2/build/autotools/Makefile.in --- clutk-0.3.32/build/autotools/Makefile.in 2010-06-10 17:21:11.000000000 +0100 +++ clutk-0.3.32+0opengles2/build/autotools/Makefile.in 2010-06-19 10:09:29.000000000 +0100 @@ -142,8 +142,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ Q = @Q@ RANLIB = @RANLIB@ SED = @SED@ diff -Nru clutk-0.3.32/build/Makefile.in clutk-0.3.32+0opengles2/build/Makefile.in --- clutk-0.3.32/build/Makefile.in 2010-06-10 17:21:11.000000000 +0100 +++ clutk-0.3.32+0opengles2/build/Makefile.in 2010-06-19 10:09:29.000000000 +0100 @@ -181,8 +181,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ Q = @Q@ RANLIB = @RANLIB@ SED = @SED@ diff -Nru clutk-0.3.32/clutk/ctk-arb-asm-private.c clutk-0.3.32+0opengles2/clutk/ctk-arb-asm-private.c --- clutk-0.3.32/clutk/ctk-arb-asm-private.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-arb-asm-private.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1232 +0,0 @@ -/* - * Copyright 2009 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of either or both of the following licenses: - * - * 1) the GNU Lesser General Public License version 3, as published by the - * Free Software Foundation; and/or - * 2) the GNU Lesser General Public License version 2.1, as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the applicable version of the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of both the GNU Lesser General Public - * License version 3 and version 2.1 along with this program. If not, see - * - * - * Authored by: Jay Taoko - * - */ -/** - * SECTION:ctk-utils - * @short_description: Utility functions - * - * Utility functions - */ - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include "ctk-utils.h" -#include "ctk-arb-asm-private.h" -#include - -ShaderProgramASM* ctk_create_shader_asm_program_from_source(const char* vstxt, const char* fstxt) -{ - ShaderProgramASM* sh = 0; - - if( vstxt == 0 || fstxt == 0) - { - return NULL; - } - - sh = (ShaderProgramASM*) g_malloc0(sizeof(ShaderProgramASM)); - CHECKGL ( glGenProgramsARB(1, &sh->shvert) ); - CHECKGL ( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, sh->shvert) ); - glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen (vstxt), vstxt); - - if ( GL_INVALID_OPERATION == glGetError() ) - { - const unsigned char *errString; - /* Find the error position */ - GLint errPos; - glGetIntegerv (GL_PROGRAM_ERROR_POSITION_ARB, &errPos); - /* Print implementation-dependent program */ - /* errors and warnings string. */ - errString = (const unsigned char*) glGetString (GL_PROGRAM_ERROR_STRING_ARB); - g_warning ("Error in shader at (%d): %s %s \n", errPos, errString, vstxt); - - CHECKGL ( glDeleteProgramsARB(1, &sh->shvert) ); - g_free (sh); - return 0; - } - - CHECKGL ( glGenProgramsARB(1, &sh->shfrag) ); - CHECKGL ( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, sh->shfrag) ); - glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen (fstxt), fstxt); - - if ( GL_INVALID_OPERATION == glGetError() ) - { - const unsigned char *errString; - /* Find the error position */ - GLint errPos; - glGetIntegerv (GL_PROGRAM_ERROR_POSITION_ARB, &errPos); - /* Print implementation-dependent program */ - /* errors and warnings string. */ - - errString = (const unsigned char*) glGetString (GL_PROGRAM_ERROR_STRING_ARB); - g_warning ("Error in shader at (%d): %s %s \n", errPos, errString, fstxt); - CHECKGL ( glDeleteProgramsARB(1, &sh->shvert) ); - CHECKGL ( glDeleteProgramsARB(1, &sh->shfrag) ); - g_free (sh); - return 0; - } - - return sh; -} - -void ctk_delete_shader_asm_program(ShaderProgramASM *sh) -{ - if (sh) - { - glBindProgramARB(GL_VERTEX_PROGRAM_ARB, 0); - glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0); - - if (sh->shvert) - glDeleteProgramsARB(1, &sh->shvert); - if (sh->shfrag) - glDeleteProgramsARB(1, &sh->shfrag); - } -} - -void ctk_render_quad_rt_asm(CtkRenderTarget* rt, ShaderProgramASM *shader, int window_w, int window_h, int x, int y, int w, int h, - gfloat red, gfloat green, gfloat blue, - gfloat Opacity) -{ - guint texid = ctk_render_target_get_color_buffer_ogl_id(rt); - guint texwidth = ctk_render_target_get_width(rt); - guint texheight = ctk_render_target_get_height(rt); - ctk_render_quad_asm(texid, texwidth, texheight, shader, window_w, window_h, x, y, w, h, red, green, blue, Opacity); -} - -void ctk_render_quad_asm(guint texid, guint texwidth, guint texheight, ShaderProgramASM *shader, - int window_w, int window_h, int x, int y, int w, int h, - gfloat red, gfloat green, gfloat blue, - gfloat Opacity) -{ - ClutterVertex vtx[4]; - - vtx[0].x = x; - vtx[0].y = y; - vtx[1].x = x; - vtx[1].y = y+h; - vtx[2].x = x+w; - vtx[2].y = y+h; - vtx[3].x = x+w; - vtx[3].y = y; - - ctk_render_custom_quad_asm(texid, texwidth, texheight, shader, window_w, window_h, vtx, red, green, blue, Opacity); -} - -void ctk_render_custom_quad_asm(guint texid, guint texwidth, guint texheight, ShaderProgramASM *shader, int window_w, int window_h, - ClutterVertex vtx[4], - gfloat red, gfloat green, gfloat blue, - gfloat Opacity) -{ - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - - CHECKGL( glBindTexture(GL_TEXTURE_2D, texid) ); - } - - /* Use the shader */ - CHECKGL( glEnable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, shader->shvert) ); - - CHECKGL( glEnable(GL_FRAGMENT_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader->shfrag) ); - - /* - int VertexLocation = ATTRIB_POSITION; - int TextureCoord0Location = ATTRIB_COLOR_TEXCOORD0; - int VertexColorLocation = ATTRIB_COLOR;*/ - - /* Save the blending states */ - glEnable(GL_BLEND); - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glBegin(GL_QUADS); - { - glColor4f(Opacity*red, Opacity*green, Opacity*blue, Opacity); - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 1.0f); - glVertex4f(vtx[0].x, vtx[0].y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 0.0f); - glVertex4f(vtx[1].x, vtx[1].y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 0.0f); - glVertex4f(vtx[2].x, vtx[2].y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 1.0f); - glVertex4f(vtx[3].x, vtx[3].y, 0, 1.0f); - - } - glEnd(); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - - /* Stop using the shader program */ - CHECKGL( glDisable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glDisable(GL_FRAGMENT_PROGRAM_ARB) ); -} - -void -ctk_render_masked_texture_asm (guint tex_id, - guint tex_mask_id, - guint texwidth, - guint texheight, - ShaderProgramASM* shader, - gint window_w, - gint window_h, - gint x, - gint y, - gint w, - gint h, - gfloat opacity) -{ - gint blend; - gint blend_src; - gint blend_dst; - gfloat VtxBuffer[] = { - // X Y Z W U0 V0 U1 V1 R G B A - x, y, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, opacity, - x, y+h, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, opacity, - x+w, y+h, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, opacity, - x+w, y, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, opacity, - }; - - gint VertexLocation = ATTRIB_POSITION; - gint TextureCoord0Location = ATTRIB_COLOR_TEXCOORD0; - gint TextureCoord1Location = ATTRIB_COLOR_TEXCOORD1; - gint VertexColorLocation = ATTRIB_COLOR; - - // Use the shader - { - CHECKGL( glEnable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, shader->shvert) ); - CHECKGL( glEnable(GL_FRAGMENT_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader->shfrag) ); - } - - CHECKGL(glBindBuffer(GL_ARRAY_BUFFER_ARB, 0)); - CHECKGL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); - - CHECKGL( glEnableVertexAttribArrayARB (VertexLocation) ); - CHECKGL( glVertexAttribPointerARB ((GLuint)VertexLocation, 4, GL_FLOAT, GL_FALSE, 48, VtxBuffer) ); - - if(TextureCoord0Location != -1) - { - //glClientActiveTexture(GL_TEXTURE0); - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, tex_id) ); - - CHECKGL( glEnableVertexAttribArrayARB (TextureCoord0Location) ); - CHECKGL( glVertexAttribPointerARB ((GLuint)TextureCoord0Location, 2, GL_FLOAT, GL_FALSE, 48, VtxBuffer + 4) ); - } - - if(TextureCoord1Location != -1) - { - //glClientActiveTexture(GL_TEXTURE0); - CHECKGL( glActiveTextureARB(GL_TEXTURE1) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, tex_mask_id) ); - - CHECKGL( glEnableVertexAttribArrayARB (TextureCoord1Location) ); - CHECKGL( glVertexAttribPointerARB ((GLuint)TextureCoord1Location, 2, GL_FLOAT, GL_FALSE, 48, VtxBuffer + 6) ); - } - - if(VertexColorLocation != -1) - { - CHECKGL( glEnableVertexAttribArrayARB (VertexColorLocation) ); - CHECKGL( glVertexAttribPointerARB ((GLuint)VertexColorLocation, 4, GL_FLOAT, GL_FALSE, 48, VtxBuffer + 8) ); - } - - // Preserve model-view and projection matrices - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glGetIntegerv(GL_BLEND, &blend); - glGetIntegerv(GL_BLEND_SRC, &blend_src); - glGetIntegerv(GL_BLEND_DST, &blend_dst); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - CHECKGL( glDrawArrays(GL_QUADS, 0, 4) ); - - // Restore model-view and projection matrices - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - - //glBlendFunc(blend_src, blend_dst); - - CHECKGL( glDisableVertexAttribArrayARB(VertexLocation) ); - if(TextureCoord0Location != -1) - CHECKGL( glDisableVertexAttribArrayARB(TextureCoord0Location) ); - if(TextureCoord1Location != -1) - CHECKGL( glDisableVertexAttribArrayARB(TextureCoord1Location) ); - if(VertexColorLocation != -1) - CHECKGL( glDisableVertexAttribArrayARB(VertexColorLocation) ); - - glBlendFunc(blend_src, blend_dst); - - // disable texture unit 1 so clutter can resume normally - CHECKGL( glActiveTextureARB(GL_TEXTURE1) ); - CHECKGL( glDisable (GL_TEXTURE_2D) ); - - // Stop using the shader program - CHECKGL( glDisable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glDisable(GL_FRAGMENT_PROGRAM_ARB) ); -} - -void -ctk_render_masked2_texture_asm (guint tex_id, - guint tex_mask_id, - guint texwidth, - guint texheight, - ShaderProgramASM* shader, - gint window_w, - gint window_h, - gint x, - gint y, - gint w, - gint h, - gfloat Opacity) -{ - gint blend; - gint blend_src; - gint blend_dst; - - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - - CHECKGL( glBindTexture(GL_TEXTURE_2D, tex_id) ); - } - - /* Set texture 1 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE1) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, 0) ) - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - - CHECKGL( glBindTexture(GL_TEXTURE_2D, tex_mask_id) ); - } - - /* Use the shader */ - CHECKGL( glEnable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, shader->shvert) ); - - CHECKGL( glEnable(GL_FRAGMENT_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader->shfrag) ); - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glGetIntegerv(GL_BLEND, &blend); - glGetIntegerv(GL_BLEND_SRC, &blend_src); - glGetIntegerv(GL_BLEND_DST, &blend_dst); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glBegin(GL_QUADS); - { - glColor4f(1.0, 1.0, 1.0, Opacity); - - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 1.0f); - glMultiTexCoord2f(GL_TEXTURE1, 0.0f, 1.0f); - glVertex4f(x, y, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 1.0f); - glMultiTexCoord2f(GL_TEXTURE1, 1.0f, 1.0f); - glVertex4f(x+w, y, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 0.0f); - glMultiTexCoord2f(GL_TEXTURE1, 1.0f, 0.0f); - glVertex4f(x+w, y+h, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 0.0f); - glMultiTexCoord2f(GL_TEXTURE1, 0.0f, 0.0f); - glVertex4f(x, y+h, 0, 1.0f); - } - glEnd(); - - glBlendFunc(blend_src, blend_dst); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - - /* Stop using the shader program */ - CHECKGL( glDisable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glDisable(GL_FRAGMENT_PROGRAM_ARB) ); - - /* Set texture 1 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE1) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, 0) ) - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glDisable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, 0) ); - } -} - -void -ctk_render_texture_exponent_asm (guint tex_id, - guint texwidth, - guint texheight, - gint window_w, - gint window_h, - gint x, - gint y, - gint w, - gint h, - gfloat exponent) -{ - gint blend; - gint blend_src; - gint blend_dst; - gfloat VtxBuffer[] = { - // X Y Z W U0 V0 R G B A - x, y, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, exponent, - x, y+h, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, exponent, - x+w, y+h, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, exponent, - x+w, y, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, exponent, - }; - - gint VertexLocation = ATTRIB_POSITION; - gint TextureCoord0Location = ATTRIB_COLOR_TEXCOORD0; - gint VertexColorLocation = ATTRIB_COLOR; - - // Use the shader - { - CHECKGL( glEnable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, g_shExp_asm->shvert) ); - CHECKGL( glEnable(GL_FRAGMENT_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, g_shExp_asm->shfrag) ); - } - - CHECKGL (glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, - 0, - exponent, - exponent, - exponent, - exponent)); - - CHECKGL(glBindBuffer(GL_ARRAY_BUFFER_ARB, 0)); - CHECKGL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); - - CHECKGL( glEnableVertexAttribArrayARB (VertexLocation) ); - CHECKGL( glVertexAttribPointerARB ((GLuint)VertexLocation, 4, GL_FLOAT, GL_FALSE, 40, VtxBuffer) ); - - if(TextureCoord0Location != -1) - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, tex_id) ); - - CHECKGL( glEnableVertexAttribArrayARB (TextureCoord0Location) ); - CHECKGL( glVertexAttribPointerARB ((GLuint)TextureCoord0Location, 2, GL_FLOAT, GL_FALSE, 40, VtxBuffer + 4) ); - } - - if(VertexColorLocation != -1) - { - CHECKGL( glEnableVertexAttribArrayARB (VertexColorLocation) ); - CHECKGL( glVertexAttribPointerARB ((GLuint)VertexColorLocation, 4, GL_FLOAT, GL_FALSE, 40, VtxBuffer + 6) ); - } - - // Preserve model-view and projection matrices - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glGetIntegerv(GL_BLEND, &blend); - glGetIntegerv(GL_BLEND_SRC, &blend_src); - glGetIntegerv(GL_BLEND_DST, &blend_dst); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - CHECKGL( glDrawArrays(GL_QUADS, 0, 4) ); - - // Restore model-view and projection matrices - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - - CHECKGL( glDisableVertexAttribArrayARB(VertexLocation) ); - if(TextureCoord0Location != -1) - CHECKGL( glDisableVertexAttribArrayARB(TextureCoord0Location) ); - if(VertexColorLocation != -1) - CHECKGL( glDisableVertexAttribArrayARB(VertexColorLocation) ); - - glBlendFunc(blend_src, blend_dst); - - // Stop using the shader program - CHECKGL( glDisable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glDisable(GL_FRAGMENT_PROGRAM_ARB) ); -} - -void ctk_render_quad_alpha_mask_asm( - unsigned int texid, - unsigned int texture_width, - unsigned int texture_height, - gfloat red, gfloat green, gfloat blue, gfloat alpha, - int window_w, int window_h, int x, int y, int w, int h) -{ - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - - CHECKGL( glBindTexture(GL_TEXTURE_2D, texid) ); - } - - /* Set texture 1 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE1) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, 0) ) - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glDisable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - } - - /* Use the shader */ - CHECKGL( glEnable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, g_shTextureAlpha_asm->shvert) ); - - CHECKGL( glEnable(GL_FRAGMENT_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, g_shTextureAlpha_asm->shfrag) ); - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glBegin(GL_QUADS); - { - glColor4f( - (gfloat)red, - (gfloat)green, - (gfloat)blue, - (gfloat)alpha); - - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 1.0f); - glVertex4f(x, y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 1.0f); - glVertex4f(x+w, y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 0.0f); - glVertex4f(x+w, y+h, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 0.0f); - glVertex4f(x, y+h, 0, 1.0f); - } - glEnd(); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - - /* Stop using the shader program */ - CHECKGL( glDisable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glDisable(GL_FRAGMENT_PROGRAM_ARB) ); -} - -void custom_render_quad_gaussian_blur_separable_asm(CtkRenderTarget* rt, - gboolean horizontal, gfloat sigma, - int window_w, int window_h, int x, int y, int w, int h) -{ - guint num_tap = 3; /* must be odd number */ - gfloat W[3]; - gfloat sum = 0.0f; - guint c = 0; - guint half = (num_tap-1)/2; - - sigma = 1.0f/3.0f; - - W[half] = (1.0f/(sqrt(2.0f*3.14159265358f)*sigma)) * exp(-0.0f/(2.0f*sigma*sigma)); - sum += W[half]; - for(c = 0; c < half; c++) - { - float X = (c + 1)*(c + 1); - W[half - c - 1] = W[half + c + 1] = (1.0f/(sqrt(2.0f*3.14159265358f)*sigma)) * exp(-X/(2.0f*sigma*sigma)); - sum += 2.0f * W[half - c - 1]; - } - - /* normalization */ - for(c = 0; c < num_tap; c++) - { - W[c] = W[c] / sum; - } - - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - - CHECKGL( glBindTexture(GL_TEXTURE_2D, ctk_render_target_get_color_buffer_ogl_id(rt)) ); - } - - /* Use the shader */ - CHECKGL( glEnable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, g_shBlur_asm->shvert) ); - - CHECKGL( glEnable(GL_FRAGMENT_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, g_shBlur_asm->shfrag) ); - - /*int VertexLocation = ATTRIB_POSITION; - int TextureCoord0Location = ATTRIB_COLOR_TEXCOORD0; - int VertexColorLocation = ATTRIB_COLOR;*/ - - // Set the Gaussian weights - if (horizontal) - { - float delta = 1.0f/(float)ctk_render_target_get_width(rt); - float ucoord = -((num_tap-1)/2.0f)/ctk_render_target_get_width(rt); - int ii = 0; - for(ii = 0; ii < num_tap; ii++) - { - CHECKGL( glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, ii, ucoord, 0, 0, 0) ); - CHECKGL( glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, ii+num_tap, W[ii], W[ii], W[ii], 1.0f) ); - ucoord += delta; - } - } - else - { - float delta = 1.0f/(float)ctk_render_target_get_height(rt); - float vcoord = -((num_tap-1)/2.0f)/(float)ctk_render_target_get_height(rt); - int ii = 0; - for(ii = 0; ii < num_tap; ii++) - { - CHECKGL( glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, ii, 0, vcoord, 0, 0) ); - CHECKGL( glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, ii+num_tap, W[ii], W[ii], W[ii], 1.0f) ); - vcoord += delta; - } - } - - - /*int blend; - int blend_src; - int blend_dst; - - glGetIntegerv(GL_BLEND, &blend); - glGetIntegerv(GL_BLEND_SRC, &blend_src); - glGetIntegerv(GL_BLEND_DST, &blend_dst); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/ - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glBegin(GL_QUADS); - { - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 1.0f); - glVertex4f(x, y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 1.0f); - glVertex4f(x+w, y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 0.0f); - glVertex4f(x+w, y+h, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 0.0f); - glVertex4f(x, y+h, 0, 1.0f); - } - glEnd(); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - /*glBlendFunc(blend_src, blend_dst);*/ - - /* Stop using the shader program */ - CHECKGL( glDisable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glDisable(GL_FRAGMENT_PROGRAM_ARB) ); -} - -void custom_render_quad_texture_mask_asm(unsigned int base_texid, - unsigned int texid, - unsigned int texture_width, - unsigned int texture_height, - ShaderProgramASM *shader, - int window_w, - int window_h, - int x, - int y, - int w, - int h, - float Opacity) -{ - float tile_u; - float tile_v; - /*int blend; - int blend_src; - int blend_dst;*/ - - /* To be used with the Exponent.frag shader for the honeycomb blend texture effect */ - - /* Use the shader */ - CHECKGL( glEnable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, shader->shvert) ); - - CHECKGL( glEnable(GL_FRAGMENT_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader->shfrag) ); - - /*int VertexLocation = ATTRIB_POSITION; - int TextureCoord0Location = ATTRIB_COLOR_TEXCOORD0; - int VertexColorLocation = ATTRIB_COLOR;*/ - - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, base_texid) ); - } - - /* Set texture 1 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE1) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, texid) ); - } - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - /*glGetIntegerv(GL_BLEND, &blend); - glGetIntegerv(GL_BLEND_SRC, &blend_src); - glGetIntegerv(GL_BLEND_DST, &blend_dst); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - //glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);*/ - - tile_u = (float)w/texture_width; - tile_v = (float)h/texture_height; - - glColor4f(Opacity, Opacity, Opacity, Opacity); - glBegin(GL_QUADS); - { - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 1.0f); - glMultiTexCoord2f(GL_TEXTURE1, 0.0f, tile_v); - glVertex4f(x, y, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 1.0f); - glMultiTexCoord2f(GL_TEXTURE1, tile_u, tile_v); - glVertex4f(x+w, y, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 0.0f); - glMultiTexCoord2f(GL_TEXTURE1, tile_u, 0.0f); - glVertex4f(x+w, y+h, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 0.0f); - glMultiTexCoord2f(GL_TEXTURE1, 0.0f, 0.0f); - glVertex4f(x, y+h, 0, 1.0f); - } - glEnd(); - - //glBlendFunc(blend_src, blend_dst); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - - /* Disable texture 1 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE1) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glDisable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, 0) ); - } - - /* Stop using the shader program */ - CHECKGL( glDisable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glDisable(GL_FRAGMENT_PROGRAM_ARB) ); -} - -void ctk_copy_rendertarget_to_rendertarget_asm(CtkRenderTarget* rt_src, float u0, float v0, float u1, float v1, - CtkRenderTarget* rt_dst, int x_dst, int y_dst, int w_dst, int h_dst) -{ - ctk_render_target_bind(rt_dst); - - /* Use the shader */ - CHECKGL( glEnable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, g_shTexture_asm->shvert) ); - - CHECKGL( glEnable(GL_FRAGMENT_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, g_shTexture_asm->shfrag) ); - - /*int VertexLocation = ATTRIB_POSITION; - int TextureCoord0Location = ATTRIB_COLOR_TEXCOORD0; - int VertexColorLocation = ATTRIB_COLOR;*/ - - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, ctk_render_target_get_color_buffer_ogl_id(rt_src)) ); - } - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glViewport(0, 0, ctk_render_target_get_width(rt_dst), ctk_render_target_get_height(rt_dst)) ); - CHECKGL( glScissor(0, 0, ctk_render_target_get_width(rt_dst), ctk_render_target_get_height(rt_dst)) ); - CHECKGL( glDisable(GL_SCISSOR_TEST) ); - - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, ctk_render_target_get_width(rt_dst), ctk_render_target_get_height(rt_dst), 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glBegin(GL_QUADS); - { - glMultiTexCoord2f(GL_TEXTURE0, u0, v0); - glVertex4f(x_dst, y_dst, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, u0, v1); - glVertex4f(x_dst, y_dst+h_dst, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, u1, v1); - glVertex4f(x_dst+w_dst, y_dst+h_dst, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, u1, v0); - glVertex4f(x_dst+w_dst, y_dst, 0, 1.0f); - } - glEnd(); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - - /* Stop using the shader program */ - CHECKGL( glDisable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glDisable(GL_FRAGMENT_PROGRAM_ARB) ); -} - -void ctk_copy_render_target_to_cached_texture_asm(CtkEffectContext *fxctx, CtkRenderTarget* rt_src, guint texid) -{ - CtkRenderTarget *rt_cache = ctk_effect_context_get_utility_render_target(fxctx); - guint dest_fbo = ctk_render_target_get_frame_buffer_ogl_id (rt_cache); - //guint src_fbo = 0; - - guint rt_width = ctk_render_target_get_width(rt_src); - guint rt_height = ctk_render_target_get_height(rt_src); - - ctk_render_target_resize(rt_cache, rt_width, rt_height); - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, dest_fbo)); - -//CHECKGL (glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, priv->cached_renderbuffer_texture)); -//CHECKGL (glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT, -// GL_DEPTH_COMPONENT, -// actor_screen_width, -// actor_screen_height)); -//CHECKGL (glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, -// GL_DEPTH_ATTACHMENT_EXT, -// GL_RENDERBUFFER_EXT, -// priv->cached_renderbuffer_texture)); - - CHECKGL (glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL (glBindTexture (GL_TEXTURE_2D, texid) ); - CHECKGL (glTexImage2D (GL_TEXTURE_2D, - 0, - GL_RGBA8, - rt_width, - rt_height, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - NULL)); - - CHECKGL (glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, - texid, - 0)); - - ctk_copy_rendertarget_to_rendertarget_asm(rt_src, 0.0f, 0.0f, 1.0f, 1.0f, rt_cache, 0, 0, rt_width, rt_height); - -// /*ctk_copy_rendertarget_to_rendertarget_asm (src_fbo, -// 0, 0, 1.0f, 1.0f, -// rt_src, -// 0, 0, rt_width, rt_height);*/ -// -// src_fbo = ctk_render_target_get_frame_buffer_ogl_id (rt_src); -// -// CHECKGL (glViewport (0, 0, rt_width, rt_height)); -// -// CHECKGL (glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, src_fbo)); -// CHECKGL (glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, dest_fbo)); -// -// CHECKGL( glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT) ); -// -// CHECKGL (glBlitFramebufferEXT(0, 0, rt_width, rt_height, -// 0, 0, rt_width, rt_height, -// GL_COLOR_BUFFER_BIT, GL_NEAREST)); -// -// CHECKGL (glBindFramebufferEXT (GL_READ_FRAMEBUFFER_EXT, 0)); -// CHECKGL (glBindFramebufferEXT (GL_DRAW_FRAMEBUFFER_EXT, 0)); -// -// CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, dest_fbo)); -// -// // remove the texture attached to the render target -// CHECKGL (glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, -// GL_COLOR_ATTACHMENT0_EXT, -// GL_TEXTURE_2D, -// 0, -// 0)); -// -// CHECKGL (glActiveTextureARB(GL_TEXTURE0) ); -// CHECKGL (glBindTexture (GL_TEXTURE_2D, 0) ); -// -// CHECKGL (glBindFramebufferEXT (GL_READ_FRAMEBUFFER_EXT, 0)); -// CHECKGL (glBindFramebufferEXT (GL_DRAW_FRAMEBUFFER_EXT, 0)); -// CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0)); -} - -void -compute_gaussian_kernel (gint iRadius, /* radius of kernel */ - gfloat fDeviation, /* deviation to use, 0.0f for auto */ - gfloat* W /* pointer to array for coefficients */) -{ - guint num_tap = 7; /* must be odd number */ - - gfloat sum = 0.0f; - guint i = 0; - - float sigma = 1.0f; - guint half = (num_tap-1)/2; - - W[half] = (1.0f/(sqrt(2.0f*3.14159265358f)*sigma)) * exp(0.0f/(2.0f*sigma*sigma)); - sum += W[half]; - for(i = 0; i < half; i++) - { - float X = (i + 1)*(i + 1); - W[half - i - 1] = W[half + i + 1] = (1.0f/(sqrt(2.0f*3.14159265358f)*sigma)) * exp(-X/(2.0f*sigma*sigma)); - sum += 2.0f * W[half - i - 1]; - } - - /* normalization */ - for(i = 0; i < num_tap; i++) - { - W[i] = W[i] / sum; - } -} - -void -opengl_blur_pass (guint pSrcTexture, /* texture to read from */ - guint src_width, - guint src_height, - GLfloat fDeviation, /* std. deviation to use */ - gboolean HorizontalDirection, /* do which pass of the blur */ - GLint iWindowWidth, /* width of window/context */ - GLint iWindowHeight, /* height of window/context */ - gboolean invertTexCoord) -{ - gfloat hdelta = 0; - gfloat vdelta = 0; - static GLfloat afKernel[12]; - - static GLfloat aafVertices[4][3]; - - /* Use the shader */ - CHECKGL( glEnable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_VERTEX_PROGRAM_ARB, g_shMultipassBlur_asm->shvert) ); - - CHECKGL( glEnable(GL_FRAGMENT_PROGRAM_ARB) ); - CHECKGL( glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, g_shMultipassBlur_asm->shfrag) ); - - CHECKGL (glActiveTextureARB (GL_TEXTURE0)); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL (glBindTexture (GL_TEXTURE_2D, pSrcTexture)); - CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); - CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST)); - CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP)); - CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP)); - - compute_gaussian_kernel (5, fDeviation, afKernel); - - if (HorizontalDirection == FALSE) - { - /* Vertical blur */ - hdelta = 0.0f; - vdelta = 1.0f / src_height; - } - else - { - /* Horizontal blur */ - hdelta = 1.0f / src_width; - vdelta = 0.0f; - } - - aafVertices[0][0] = 0.0f; - aafVertices[0][1] = invertTexCoord?src_height:0.0; - aafVertices[0][2] = 0.0f; - - aafVertices[1][0] = 0.0f; - aafVertices[1][1] = invertTexCoord?0.0f:src_height; - aafVertices[1][2] = 0.0f; - - aafVertices[2][0] = src_width; - aafVertices[2][1] = invertTexCoord?0.0f:src_height; - aafVertices[2][2] = 0.0f; - - aafVertices[3][0] = src_width; - aafVertices[3][1] = invertTexCoord?src_height:0.0; - aafVertices[3][2] = 0.0f; - - CHECKGL (glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, - 0, - afKernel[0], - afKernel[1], - afKernel[2], - afKernel[3])); - CHECKGL (glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, - 1, - afKernel[4], - afKernel[5], - afKernel[6], - afKernel[7])); - CHECKGL (glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, - 2, - afKernel[8], - afKernel[9], - afKernel[10], - afKernel[11])); - - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, iWindowWidth, iWindowHeight, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glBegin (GL_QUADS); - glColor4f (1.0f, 1.0f, 1.0f, 1.0f); - - glMultiTexCoord2fARB (GL_TEXTURE0, 0.0f + hdelta * -3.0f, 1.0f + vdelta * -3.0f); - glMultiTexCoord2fARB (GL_TEXTURE1, 0.0f + hdelta * -2.0f, 1.0f + vdelta * -2.0f); - glMultiTexCoord2fARB (GL_TEXTURE2, 0.0f + hdelta * -1.0f, 1.0f + vdelta * -1.0f); - glMultiTexCoord2fARB (GL_TEXTURE3, 0.0f + hdelta * 0.0f, 1.0f + vdelta * -0.0f); - glMultiTexCoord2fARB (GL_TEXTURE4, 0.0f + hdelta * 1.0f, 1.0f + vdelta * 1.0f); - glMultiTexCoord2fARB (GL_TEXTURE5, 0.0f + hdelta * 2.0f, 1.0f + vdelta * 2.0f); - glMultiTexCoord2fARB (GL_TEXTURE6, 0.0f + hdelta * 3.0f, 1.0f + vdelta * 3.0f); - //glMultiTexCoord2fARB (GL_TEXTURE7, 0.0f + hdelta * 4.0f, 1.0f + vdelta * 4.0f); - glVertex3f (aafVertices[0][0], aafVertices[0][1], aafVertices[0][2]); - - glMultiTexCoord2fARB (GL_TEXTURE0, 0.0f + hdelta * -3.0f, 0.0f + vdelta * -3.0f); - glMultiTexCoord2fARB (GL_TEXTURE1, 0.0f + hdelta * -2.0f, 0.0f + vdelta * -2.0f); - glMultiTexCoord2fARB (GL_TEXTURE2, 0.0f + hdelta * -1.0f, 0.0f + vdelta * -1.0f); - glMultiTexCoord2fARB (GL_TEXTURE3, 0.0f + hdelta * 0.0f, 0.0f + vdelta * -0.0f); - glMultiTexCoord2fARB (GL_TEXTURE4, 0.0f + hdelta * 1.0f, 0.0f + vdelta * 1.0f); - glMultiTexCoord2fARB (GL_TEXTURE5, 0.0f + hdelta * 2.0f, 0.0f + vdelta * 2.0f); - glMultiTexCoord2fARB (GL_TEXTURE6, 0.0f + hdelta * 3.0f, 0.0f + vdelta * 3.0f); - //glMultiTexCoord2fARB (GL_TEXTURE7, 0.0f + hdelta * 4.0f, 0.0f + vdelta * 4.0f); - glVertex3f (aafVertices[1][0], aafVertices[1][1], aafVertices[1][2]); - - glMultiTexCoord2fARB (GL_TEXTURE0, 1.0f + hdelta * -3.0f, 0.0f + vdelta * -3.0f); - glMultiTexCoord2fARB (GL_TEXTURE1, 1.0f + hdelta * -2.0f, 0.0f + vdelta * -2.0f); - glMultiTexCoord2fARB (GL_TEXTURE2, 1.0f + hdelta * -1.0f, 0.0f + vdelta * -1.0f); - glMultiTexCoord2fARB (GL_TEXTURE3, 1.0f + hdelta * 0.0f, 0.0f + vdelta * 0.0f); - glMultiTexCoord2fARB (GL_TEXTURE4, 1.0f + hdelta * 1.0f, 0.0f + vdelta * 1.0f); - glMultiTexCoord2fARB (GL_TEXTURE5, 1.0f + hdelta * 2.0f, 0.0f + vdelta * 2.0f); - glMultiTexCoord2fARB (GL_TEXTURE6, 1.0f + hdelta * 3.0f, 0.0f + vdelta * 3.0f); - //glMultiTexCoord2fARB (GL_TEXTURE7, 1.0f + hdelta * 4.0f, 0.0f + vdelta * 4.0f); - glVertex3f (aafVertices[2][0], aafVertices[2][1], aafVertices[2][2]); - - glMultiTexCoord2fARB (GL_TEXTURE0, 1.0f + hdelta * -3.0f, 1.0f + vdelta * -3.0f); - glMultiTexCoord2fARB (GL_TEXTURE1, 1.0f + hdelta * -2.0f, 1.0f + vdelta * -2.0f); - glMultiTexCoord2fARB (GL_TEXTURE2, 1.0f + hdelta * -1.0f, 1.0f + vdelta * -1.0f); - glMultiTexCoord2fARB (GL_TEXTURE3, 1.0f + hdelta * 0.0f, 1.0f + vdelta * 0.0f); - glMultiTexCoord2fARB (GL_TEXTURE4, 1.0f + hdelta * 1.0f, 1.0f + vdelta * 1.0f); - glMultiTexCoord2fARB (GL_TEXTURE5, 1.0f + hdelta * 2.0f, 1.0f + vdelta * 2.0f); - glMultiTexCoord2fARB (GL_TEXTURE6, 1.0f + hdelta * 3.0f, 1.0f + vdelta * 3.0f); - //glMultiTexCoord2fARB (GL_TEXTURE7, 1.0f + hdelta * 4.0f, 1.0f + vdelta * 4.0f); - glVertex3f (aafVertices[3][0], aafVertices[3][1], aafVertices[3][2]); - - glEnd (); - - /* Stop using the shader program */ - CHECKGL( glDisable(GL_VERTEX_PROGRAM_ARB) ); - CHECKGL( glDisable(GL_FRAGMENT_PROGRAM_ARB) ); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } -} - - - diff -Nru clutk-0.3.32/clutk/ctk-arb-asm-private.h clutk-0.3.32+0opengles2/clutk/ctk-arb-asm-private.h --- clutk-0.3.32/clutk/ctk-arb-asm-private.h 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-arb-asm-private.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,178 +0,0 @@ -/* - * Copyright 2009 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of either or both of the following licenses: - * - * 1) the GNU Lesser General Public License version 3, as published by the - * Free Software Foundation; and/or - * 2) the GNU Lesser General Public License version 2.1, as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the applicable version of the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of both the GNU Lesser General Public - * License version 3 and version 2.1 along with this program. If not, see - * - * - * Authored by: Jay Taoko - * - */ - -#ifndef _CTK_ASM_ARB_PRIVATE_H_ -#define _CTK_ASM_ARB_PRIVATE_H_ - -#include -#include -#include -#include -#include -#include -#include - -G_BEGIN_DECLS - -#define ATTRIB_INVALID -1 -#define ATTRIB_POSITION 0 -#define ATTRIB_WEIGHT 1 -#define ATTRIB_NORMAL 2 -#define ATTRIB_COLOR 3 -#define ATTRIB_COLOR_PRIMARY 3 -#define ATTRIB_COLOR_SECONDARY 4 -#define ATTRIB_COLOR_FOGCOORD 5 -#define ATTRIB_COLOR_TEXCOORD 8 -#define ATTRIB_COLOR_TEXCOORD0 8 -#define ATTRIB_COLOR_TEXCOORD1 9 -#define ATTRIB_COLOR_TEXCOORD2 10 -#define ATTRIB_COLOR_TEXCOORD3 11 -#define ATTRIB_COLOR_TEXCOORD4 12 -#define ATTRIB_COLOR_TEXCOORD5 13 -#define ATTRIB_COLOR_TEXCOORD6 14 -#define ATTRIB_COLOR_TEXCOORD7 15 - -typedef struct -{ - guint shvert; - guint shfrag; -} ShaderProgramASM; - -ShaderProgramASM* g_shTexture_asm; -ShaderProgramASM* g_shColor_asm; -ShaderProgramASM* g_shTextureAlpha_asm; -ShaderProgramASM* g_shBlur_asm; -ShaderProgramASM* g_shExp_asm; -ShaderProgramASM* g_shMultipassBlur_asm; -ShaderProgramASM* g_shTextureMask_asm; - -/* ARB program */ -ShaderProgramASM* ctk_create_shader_asm_program_from_source(const char* vtx_filename, const char* frag_filename); -void ctk_delete_shader_asm_program(ShaderProgramASM *sh); - -void ctk_render_quad_rt_asm(CtkRenderTarget* rt, ShaderProgramASM *shader, int window_w, int window_h, int x, int y, int w, int h, - gfloat red, gfloat green, gfloat blue, - gfloat Opacity); - -void ctk_render_quad_asm(guint texid, guint texwidth, guint texheight, ShaderProgramASM *shader, - int window_w, int window_h, int x, int y, int w, int h, - gfloat red, gfloat green, gfloat blue, - gfloat Opacity); - -void ctk_render_custom_quad_asm(guint texid, guint texwidth, guint texheight, ShaderProgramASM *shader, int window_w, int window_h, - ClutterVertex vtx[4], - gfloat red, gfloat green, gfloat blue, - gfloat Opacity); - -void ctk_render_custom_quad_asm_test(guint texid0, guint texid1, guint texid2, int window_w, int window_h, float x, float y, float width, float height); - -void ctk_render_quad_alpha_mask_asm( - unsigned int texid, - unsigned int texture_width, - unsigned int texture_height, - gfloat red, gfloat green, gfloat blue, gfloat alpha, - int window_w, int window_h, int x, int y, int w, int h); - -void ctk_render_texture_exponent_asm (guint tex_id, - guint texwidth, - guint texheight, - gint window_w, - gint window_h, - gint x, - gint y, - gint w, - gint h, - gfloat exponent); - -void custom_render_quad_gaussian_blur_separable_asm(CtkRenderTarget* rt, - gboolean horizontal, gfloat sigma, - int window_w, int window_h, int x, int y, int w, int h); - -void custom_render_quad_texture_mask_asm(unsigned int base_texid, - unsigned int texid, - unsigned int texture_width, - unsigned int texture_height, - ShaderProgramASM *shader, - int window_w, - int window_h, - int x, - int y, - int w, - int h, - float opacity); - -void ctk_copy_rendertarget_to_rendertarget_asm(CtkRenderTarget* rt_src, - float u0, - float v0, - float u1, - float v1, - CtkRenderTarget* rt_dst, - int x_dst, - int y_dst, - int w_dst, - int h_dst); - -void ctk_copy_render_target_to_cached_texture_asm(CtkEffectContext *fxctx, CtkRenderTarget* rt_src, guint texid); -/* End ARB Program*/ - -void opengl_blur_pass (guint pSrcTexture, /* texture to read from */ - guint src_width, - guint src_height, - GLfloat fDeviation, /* std. deviatino to use */ - gboolean HorizontalDirection, /* do which pass of the blur */ - GLint iWindowWidth, /* width of window/context */ - GLint iWindowHeight, /* height of window/context */ - gboolean invertTexCoord); - -void ctk_render_masked_texture_asm (guint tex_id, - guint tex_mask_id, - guint texwidth, - guint texheight, - ShaderProgramASM* shader, - gint window_w, - gint window_h, - gint x, - gint y, - gint w, - gint h, - gfloat opacity); - -void ctk_render_masked2_texture_asm (guint tex_id, - guint tex_mask_id, - guint texwidth, - guint texheight, - ShaderProgramASM* shader, - gint window_w, - gint window_h, - gint x, - gint y, - gint w, - gint h, - gfloat opacity); - -G_END_DECLS - -#endif /* _CTK_ASM_ARB_PRIVATE_H_ */ - diff -Nru clutk-0.3.32/clutk/ctk-effect-blur.c clutk-0.3.32+0opengles2/clutk/ctk-effect-blur.c --- clutk-0.3.32/clutk/ctk-effect-blur.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-effect-blur.c 2010-06-19 10:23:24.000000000 +0100 @@ -35,11 +35,10 @@ #include #endif -#include -#include +#include +#include #include "ctk-gfx-private.h" -#include "ctk-arb-asm-private.h" #include "ctk-actor.h" #include "ctk-effect-context.h" #include "ctk-effect-blur.h" @@ -155,13 +154,13 @@ priv->cached_effect_texture = 0; CHECKGL (glGenTextures (1, &priv->cached_effect_texture)); - CHECKGL (glActiveTextureARB(GL_TEXTURE0) ); + CHECKGL (glActiveTexture(GL_TEXTURE0) ); CHECKGL (glBindTexture (GL_TEXTURE_2D, priv->cached_effect_texture)); - CHECKGL (glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL)); + CHECKGL (glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); - CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP)); - CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP)); + CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)); + CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)); priv->cached_init = FALSE; } @@ -233,6 +232,7 @@ static void ctk_effect_blur_paint (CtkEffect *effect, CtkEffectPaintFunc paint_func, gboolean is_last_effect) { +#if 0 ClutterActor *actor = NULL; CtkEffectContext* fxctx = NULL; ClutterActor* stage = NULL; @@ -256,6 +256,14 @@ gboolean UseCache = FALSE; gboolean dirty_effect_cache = TRUE; + gint blend; + gint blend_src; + gint blend_dst; + + glGetIntegerv(GL_BLEND, &blend); + glGetIntegerv(GL_BLEND_SRC_RGB, &blend_src); + glGetIntegerv(GL_BLEND_DST_RGB, &blend_dst); + actor = ctk_effect_get_actor (effect); g_return_if_fail (CLUTTER_IS_ACTOR (actor)); @@ -301,7 +309,7 @@ CHECKGL (glDisable (GL_SCISSOR_TEST)); /* make sure we are not using a shader program */ - CHECKGL (glClearDepth (1.0f)); + CHECKGL (glClearDepthf (1.0f)); CHECKGL (glClearStencil (0)); CHECKGL (glClearColor (0.0f, 0.0f, 0.0f, 0.0f)); CHECKGL (glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE)); @@ -482,6 +490,7 @@ { ctk_effect_context_release_render_target (fxctx, rt1); } +#endif } /* diff -Nru clutk-0.3.32/clutk/ctk-effect-context.c clutk-0.3.32+0opengles2/clutk/ctk-effect-context.c --- clutk-0.3.32/clutk/ctk-effect-context.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-effect-context.c 2010-06-19 10:00:43.000000000 +0100 @@ -38,8 +38,8 @@ #include #endif -#include -#include +#include +#include #include "ctk-effect-context.h" #include "ctk-gfx-private.h" diff -Nru clutk-0.3.32/clutk/ctk-effect-drop-shadow.c clutk-0.3.32+0opengles2/clutk/ctk-effect-drop-shadow.c --- clutk-0.3.32/clutk/ctk-effect-drop-shadow.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-effect-drop-shadow.c 2010-06-19 10:22:51.000000000 +0100 @@ -35,11 +35,10 @@ #include #endif -#include -#include +#include +#include #include "ctk-gfx-private.h" -#include "ctk-arb-asm-private.h" #include "ctk-actor.h" #include "ctk-effect-context.h" #include "ctk-effect-drop-shadow.h" @@ -171,13 +170,13 @@ priv->cached_effect_texture = 0; CHECKGL (glGenTextures (1, &priv->cached_effect_texture)); - CHECKGL (glActiveTextureARB(GL_TEXTURE0) ); + CHECKGL (glActiveTexture(GL_TEXTURE0) ); CHECKGL (glBindTexture (GL_TEXTURE_2D, priv->cached_effect_texture)); - CHECKGL (glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL)); + CHECKGL (glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); - CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP)); - CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP)); + CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)); + CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)); priv->cached_init = FALSE; } @@ -261,6 +260,7 @@ CtkEffectPaintFunc paint_func, gboolean is_last_effect) { +#if 0 ClutterActor* actor = NULL; CtkEffectContext* fxctx = NULL; ClutterActor* stage = NULL; @@ -329,7 +329,7 @@ CHECKGL (glDisable (GL_SCISSOR_TEST)); /* make sure we are not using a shader program */ - CHECKGL (glClearDepth (1.0f)); + CHECKGL (glClearDepthf (1.0f)); CHECKGL (glClearStencil (0)); CHECKGL (glClearColor (0.0f, 0.0f, 0.0f, 0.0f)); CHECKGL (glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE)); @@ -523,6 +523,7 @@ { ctk_effect_context_release_render_target (fxctx, rt1); } +#endif } /* diff -Nru clutk-0.3.32/clutk/ctk-effect-glow.c clutk-0.3.32+0opengles2/clutk/ctk-effect-glow.c --- clutk-0.3.32/clutk/ctk-effect-glow.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-effect-glow.c 2010-06-19 10:23:30.000000000 +0100 @@ -35,11 +35,10 @@ #include #endif -#include -#include +#include +#include #include "ctk-gfx-private.h" -#include "ctk-arb-asm-private.h" #include "ctk-actor.h" #include "ctk-effect-context.h" #include "ctk-effect-glow.h" @@ -187,9 +186,9 @@ priv->cached_effect_texture = 0; CHECKGL (glGenTextures (1, &priv->cached_effect_texture)); - CHECKGL (glActiveTextureARB(GL_TEXTURE0) ); + CHECKGL (glActiveTexture(GL_TEXTURE0) ); CHECKGL (glBindTexture (GL_TEXTURE_2D, priv->cached_effect_texture)); - CHECKGL (glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL)); + CHECKGL (glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP)); @@ -284,6 +283,7 @@ CtkEffectPaintFunc paint_func, gboolean is_last_effect) { +#if 0 ClutterActor* actor = NULL; CtkEffectContext* fxctx = NULL; ClutterActor* stage = NULL; @@ -350,12 +350,11 @@ CHECKGL (glViewport (0, 0, stage_width, stage_height)); CHECKGL (glScissor (0, 0, stage_width, stage_height)); CHECKGL (glDisable (GL_SCISSOR_TEST)); - CHECKGL (glDisable (GL_ALPHA_TEST)); CHECKGL (glDisable (GL_STENCIL_TEST)); /* make sure we are not using a shader program */ - CHECKGL (glClearDepth (1.0f)); + CHECKGL (glClearDepthf (1.0f)); CHECKGL (glClearStencil (0)); CHECKGL (glClearColor (0.0f, 0.0f, 0.0f, 0.0f)); CHECKGL (glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE)); @@ -489,6 +488,7 @@ actor_opacity = (float) clutter_actor_get_paint_opacity (CLUTTER_ACTOR (actor)) / 255.0f; effect_opacity = (float) ctk_effect_get_opacity (effect); +#ifdef HAVE_OPENGL_ASM { if (!UseCache) { @@ -548,6 +548,7 @@ } } +#endif /* render the actor on top of the glow */ if (is_last_effect) { @@ -570,6 +571,7 @@ { ctk_effect_context_release_render_target (fxctx, rt1); } +#endif } /* @@ -737,10 +739,13 @@ CHECKGL( glGetIntegerv(GL_UNPACK_ALIGNMENT, &unpack) ); CHECKGL( glPixelStorei(GL_UNPACK_ALIGNMENT, 4) ); + +#ifdef GL_UNPACK_ROW_LENGTH CHECKGL( glPixelStorei(GL_UNPACK_ROW_LENGTH, 0) ); CHECKGL( glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0) ); CHECKGL( glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0) ); CHECKGL( glPixelStorei(GL_UNPACK_SKIP_ROWS, 0) ); +#endif /* Read bits */ if(nChannel == 3) diff -Nru clutk-0.3.32/clutk/ctk-gfx-private.c clutk-0.3.32+0opengles2/clutk/ctk-gfx-private.c --- clutk-0.3.32/clutk/ctk-gfx-private.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-gfx-private.c 2010-06-19 10:00:43.000000000 +0100 @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include #include "ctk-utils.h" @@ -128,556 +128,6 @@ } } -void ctk_render_quad_rt(CtkRenderTarget* rt, ShaderProgram *shader, int window_w, int window_h, int x, int y, int w, int h) -{ - guint texid = ctk_render_target_get_color_buffer_ogl_id(rt); - guint texwidth = ctk_render_target_get_width(rt); - guint texheight = ctk_render_target_get_height(rt); - ctk_render_quad(texid, texwidth, texheight, shader, window_w, window_h, x, y, w, h); -} - -void ctk_render_quad(guint texid, guint texwidth, guint texheight, ShaderProgram *shader, int window_w, int window_h, int x, int y, int w, int h) -{ - ClutterVertex vtx[4]; - - vtx[0].x = x; - vtx[0].y = y; - vtx[1].x = x; - vtx[1].y = y+h; - vtx[2].x = x+w; - vtx[2].y = y+h; - vtx[3].x = x+w; - vtx[3].y = y; - - ctk_render_custom_quad(texid, texwidth, texheight, shader, window_w, window_h, vtx); -} - -void ctk_render_custom_quad(guint texid, guint texwidth, guint texheight, ShaderProgram *shader, int window_w, int window_h, ClutterVertex vtx[4]) -{ - GLint loc; - - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - - CHECKGL( glBindTexture(GL_TEXTURE_2D, texid) ); - } - - /* Use the shader */ - CHECKGL( glUseProgram(shader->shprog) ); - loc = glGetUniformLocationARB(shader->shprog, "Tex0"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform1iARB(loc, 0) ); - loc = glGetUniformLocationARB(shader->shprog, "TextureSize"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform2fARB(loc, texwidth, texheight) ); - - /*int blend; - int blend_src; - int blend_dst; - - glGetIntegerv(GL_BLEND, &blend); - glGetIntegerv(GL_BLEND_SRC, &blend_src); - glGetIntegerv(GL_BLEND_DST, &blend_dst); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/ - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glBegin(GL_QUADS); - { - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 1.0f); - glVertex4f(vtx[0].x, vtx[0].y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 0.0f); - glVertex4f(vtx[1].x, vtx[1].y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 0.0f); - glVertex4f(vtx[2].x, vtx[2].y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 1.0f); - glVertex4f(vtx[3].x, vtx[3].y, 0, 1.0f); - - } - glEnd(); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - /*glBlendFunc(blend_src, blend_dst);*/ - - /* Stop using the shader program */ - CHECKGL( glUseProgram(0) ); - -} - -void ctk_render_quad_alpha_mask( - unsigned int texid, - unsigned int texture_width, - unsigned int texture_height, - gfloat red, gfloat green, gfloat blue, gfloat alpha, - int window_w, int window_h, int x, int y, int w, int h) -{ - GLint loc; - - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - - CHECKGL( glBindTexture(GL_TEXTURE_2D, texid /*ctk_render_target_get_color_buffer_ogl_id(rt)*/) ); - } - - /* Use the shader */ - CHECKGL( glUseProgram(g_shTextureAlpha->shprog) ); - loc = glGetUniformLocationARB(g_shTextureAlpha->shprog, "Tex0"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform1iARB(loc, 0) ); - loc = glGetUniformLocationARB(g_shTextureAlpha->shprog, "TextureSize"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform2fARB(loc, texture_width, texture_height) ); - loc = glGetUniformLocationARB(g_shTextureAlpha->shprog, "MaskColor"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform4fARB(loc, - (gfloat)red, - (gfloat)green, - (gfloat)blue, - (gfloat)alpha) ); - - int blend; - int blend_src; - int blend_dst; - - glGetIntegerv(GL_BLEND, &blend); - glGetIntegerv(GL_BLEND_SRC, &blend_src); - glGetIntegerv(GL_BLEND_DST, &blend_dst); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glBegin(GL_QUADS); - { - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 1.0f); - glVertex4f(x, y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 1.0f); - glVertex4f(x+w, y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 0.0f); - glVertex4f(x+w, y+h, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 0.0f); - glVertex4f(x, y+h, 0, 1.0f); - } - glEnd(); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - glBlendFunc(blend_src, blend_dst); - - /* Stop using the shader program */ - CHECKGL( glUseProgram(0) ); -} - -void custom_render_quad_gaussian_blur_separable(CtkRenderTarget* rt, - ShaderProgram *shader, gfloat sigma, - int window_w, int window_h, int x, int y, int w, int h) -{ - GLint loc; - guint num_tap = 7; /* must be odd number */ - gfloat W[num_tap]; - gfloat sum = 0.0f; - guint i = 0; - - guint half = (num_tap-1)/2; - - W[half] = (1.0f/(sqrt(2.0f*3.14159265358f)*sigma)) * exp(-0.0f/(2.0f*sigma*sigma)); - sum += W[half]; - for(i = 0; i < half; i++) - { - float X = (i + 1)*(i + 1); - W[half - i - 1] = W[half + i + 1] = (1.0f/(sqrt(2.0f*3.14159265358f)*sigma)) * exp(-X/(2.0f*sigma*sigma)); - sum += 2.0f * W[half - i - 1]; - } - - /* normalization */ - for(i = 0; i < num_tap; i++) - { - W[i] = W[i] / sum; - } - - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - - CHECKGL( glBindTexture(GL_TEXTURE_2D, ctk_render_target_get_color_buffer_ogl_id(rt)) ); - } - - /* Use the shader */ - CHECKGL( glUseProgram(shader->shprog) ); - loc = glGetUniformLocationARB(shader->shprog, "Tex0"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform1iARB(loc, 0) ); - loc = glGetUniformLocationARB(shader->shprog, "TextureSize"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform2fARB(loc, ctk_render_target_get_width(rt), ctk_render_target_get_height(rt)) ); - loc = glGetUniformLocationARB(shader->shprog, "W"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform1fv(loc, num_tap, W) ); - - /*int blend; - int blend_src; - int blend_dst; - - glGetIntegerv(GL_BLEND, &blend); - glGetIntegerv(GL_BLEND_SRC, &blend_src); - glGetIntegerv(GL_BLEND_DST, &blend_dst); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/ - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glBegin(GL_QUADS); - { - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 1.0f); - glVertex4f(x, y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 1.0f); - glVertex4f(x+w, y, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 0.0f); - glVertex4f(x+w, y+h, 0, 1.0f); - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 0.0f); - glVertex4f(x, y+h, 0, 1.0f); - } - glEnd(); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - /*glBlendFunc(blend_src, blend_dst);*/ - - /* Stop using the shader program */ - CHECKGL( glUseProgram(0) ); -} - -void custom_render_quad_texture_mask(CtkRenderTarget* fbo, - unsigned int texid, - unsigned int texture_width, - unsigned int texture_height, - ShaderProgram *shader, - int window_w, - int window_h, - int x, - int y, - int w, - int h) -{ - GLint loc; - - /* Use the shader */ - CHECKGL( glUseProgram(shader->shprog) ); - - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, ctk_render_target_get_color_buffer_ogl_id(fbo)) ); - } - - /* Set texture 1 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE1) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, texid) ); - } - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, window_w, window_h, 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - loc = glGetUniformLocationARB(shader->shprog, "Tex0"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform1iARB(loc, 0) ); - - loc = glGetUniformLocationARB(shader->shprog, "Tex1"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform1iARB(loc, 1) ); - - loc = glGetUniformLocationARB(shader->shprog, "TextureSize"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform2fARB(loc, ctk_render_target_get_width(fbo), ctk_render_target_get_height(fbo)) ); - - int blend; - int blend_src; - int blend_dst; - - glGetIntegerv(GL_BLEND, &blend); - glGetIntegerv(GL_BLEND_SRC, &blend_src); - glGetIntegerv(GL_BLEND_DST, &blend_dst); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - //glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - - float tile_u = (float)w/texture_width; - float tile_v = (float)h/texture_height; - - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glBegin(GL_QUADS); - { - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 1.0f); - glMultiTexCoord2f(GL_TEXTURE1, 0.0f, tile_v); - glVertex4f(x, y, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 1.0f); - glMultiTexCoord2f(GL_TEXTURE1, tile_u, tile_v); - glVertex4f(x+w, y, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, 1.0f, 0.0f); - glMultiTexCoord2f(GL_TEXTURE1, tile_u, 0.0f); - glVertex4f(x+w, y+h, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, 0.0f, 0.0f); - glMultiTexCoord2f(GL_TEXTURE1, 0.0f, 0.0f); - glVertex4f(x, y+h, 0, 1.0f); - } - glEnd(); - - glBlendFunc(blend_src, blend_dst); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - - /* Disable texture 1 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE1) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glDisable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, 0) ); - } - - /* Stop using the shader program */ - CHECKGL( glUseProgram(0) ); -} - -void ctk_copy_rendertarget_to_rendertarget(CtkRenderTarget* rt_src, float u0, float v0, float u1, float v1, - CtkRenderTarget* rt_dst, int x_dst, int y_dst, int w_dst, int h_dst) -{ - - GLint loc; - - ctk_render_target_bind(rt_dst); - /* Use the shader */ - CHECKGL( glUseProgram(g_shTexture->shprog) ); - - /* Set texture 0 environment mode */ - { - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL( glDisable (GL_TEXTURE_1D) ); - CHECKGL( glEnable (GL_TEXTURE_2D) ); - CHECKGL( glDisable (GL_TEXTURE_3D) ); - CHECKGL( glDisable (GL_TEXTURE_CUBE_MAP_EXT) ); - CHECKGL( glDisable (GL_TEXTURE_RECTANGLE_ARB) ); - CHECKGL( glBindTexture(GL_TEXTURE_2D, ctk_render_target_get_color_buffer_ogl_id(rt_src)) ); - } - - /* Preserve model-view and projection matrices */ - { - CHECKGL( glViewport(0, 0, ctk_render_target_get_width(rt_dst), ctk_render_target_get_height(rt_dst)) ); - CHECKGL( glScissor(0, 0, ctk_render_target_get_width(rt_dst), ctk_render_target_get_height(rt_dst)) ); - CHECKGL( glDisable(GL_SCISSOR_TEST) ); - - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - CHECKGL( glOrtho(0, ctk_render_target_get_width(rt_dst), ctk_render_target_get_height(rt_dst), 0, -1, 1) ); - - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPushMatrix() ); - CHECKGL( glLoadIdentity() ); - } - - loc = glGetUniformLocationARB(g_shTexture->shprog, "Tex0"); - CHECKGL_MSG( "glGetUniformLocationARB" ); - CHECKGL( glUniform1iARB(loc, 0) ); - -// loc = glGetUniformLocationARB(shader->shprog, "TextureSize"); -// CHECKGL_MSG( "glGetUniformLocationARB" ); -// CHECKGL( glUniform2fARB(loc, ctk_render_target_get_width(fbo), ctk_render_target_get_height(fbo)) ); - - glDisable(GL_BLEND); - - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - glBegin(GL_QUADS); - { - glMultiTexCoord2f(GL_TEXTURE0, u0, v0); - glVertex4f(x_dst, y_dst, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, u0, v1); - glVertex4f(x_dst, y_dst+h_dst, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, u1, v1); - glVertex4f(x_dst+w_dst, y_dst+h_dst, 0, 1.0f); - - glMultiTexCoord2f(GL_TEXTURE0, u1, v0); - glVertex4f(x_dst+w_dst, y_dst, 0, 1.0f); - } - glEnd(); - - /* Restore model-view and projection matrices */ - { - CHECKGL( glMatrixMode(GL_PROJECTION) ); - CHECKGL( glPopMatrix() ); - CHECKGL( glMatrixMode(GL_MODELVIEW) ); - CHECKGL( glPopMatrix() ); - } - - glEnable(GL_BLEND); - - /* Stop using the shader program */ - CHECKGL( glUseProgram(0) ); -} - -void ctk_copy_render_target_to_cached_texture(CtkEffectContext *fxctx, CtkRenderTarget* rt_src, guint texid) -{ - CtkRenderTarget *rt_cache = ctk_effect_context_get_utility_render_target(fxctx); - guint dest_fbo = ctk_render_target_get_frame_buffer_ogl_id (rt_cache); - - guint rt_width = ctk_render_target_get_width(rt_src); - guint rt_height = ctk_render_target_get_height(rt_src); - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, dest_fbo)); - -//CHECKGL (glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, priv->cached_renderbuffer_texture)); -//CHECKGL (glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT, -// GL_DEPTH_COMPONENT, -// actor_screen_width, -// actor_screen_height)); -//CHECKGL (glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, -// GL_DEPTH_ATTACHMENT_EXT, -// GL_RENDERBUFFER_EXT, -// priv->cached_renderbuffer_texture)); - - CHECKGL (glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL (glBindTexture (GL_TEXTURE_2D, texid) ); - CHECKGL (glTexImage2D (GL_TEXTURE_2D, - 0, - GL_RGBA8, - rt_width, - rt_height, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - NULL)); - - CHECKGL (glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, - texid, - 0)); - - guint src_fbo = ctk_render_target_get_frame_buffer_ogl_id (rt_src); - - CHECKGL (glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, src_fbo)); - CHECKGL (glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, dest_fbo)); - CHECKGL (glBlitFramebufferEXT(0, 0, rt_width, rt_height, - 0, 0, rt_width, rt_height, - GL_COLOR_BUFFER_BIT, GL_NEAREST)); - - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, dest_fbo)); - CHECKGL (glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, - 0, - 0)); - CHECKGL (glActiveTextureARB(GL_TEXTURE0) ); - CHECKGL (glBindTexture (GL_TEXTURE_2D, 0) ); - - CHECKGL (glBindFramebufferEXT (GL_READ_FRAMEBUFFER_EXT, 0)); - CHECKGL (glBindFramebufferEXT (GL_DRAW_FRAMEBUFFER_EXT, 0)); - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0)); -} - void ctk_get_actor_screen_position (CtkActor* actor, gfloat *x, gfloat *y, gfloat *width, gfloat *height, ClutterVertex vertex[4]) { float viewport[4]; diff -Nru clutk-0.3.32/clutk/ctk-gfx-private.h clutk-0.3.32+0opengles2/clutk/ctk-gfx-private.h --- clutk-0.3.32/clutk/ctk-gfx-private.h 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-gfx-private.h 2010-06-19 10:00:43.000000000 +0100 @@ -55,49 +55,6 @@ ShaderProgram* ctk_create_shader_program_from_source(const char* vtx_filename, const char* frag_filename); void ctk_delete_shader_program(ShaderProgram *sh); -/* GLSL */ -void ctk_render_quad_rt(CtkRenderTarget* fbo, ShaderProgram *shader, int window_w, int window_h, int x, int y, int w, int h); - -void ctk_render_quad(guint texid, guint texwidth, guint texheight, ShaderProgram *shader, int window_w, int window_h, int x, int y, int w, int h); - -void ctk_render_custom_quad(guint texid, guint texwidth, guint texheight, ShaderProgram *shader, int window_w, int window_h, ClutterVertex vtx[4]); - -void ctk_render_quad_alpha_mask( - unsigned int texid, - unsigned int texture_width, - unsigned int texture_height, - gfloat red, gfloat green, gfloat blue, gfloat alpha, - int window_w, int window_h, int x, int y, int w, int h); - -void custom_render_quad_gaussian_blur_separable(CtkRenderTarget* rt, - ShaderProgram *shader, gfloat sigma, - int window_w, int window_h, int x, int y, int w, int h); - -void custom_render_quad_texture_mask(CtkRenderTarget* fbo, - unsigned int texid, - unsigned int texture_width, - unsigned int texture_height, - ShaderProgram *shader, - int window_w, - int window_h, - int x, - int y, - int w, - int h); - -void ctk_copy_rendertarget_to_rendertarget(CtkRenderTarget* rt_src, - float u0, - float v0, - float u1, - float v1, - CtkRenderTarget* rt_dst, - int x_dst, - int y_dst, - int w_dst, - int h_dst); - -void ctk_copy_render_target_to_cached_texture(CtkEffectContext *fxctx, CtkRenderTarget* rt_src, guint texid); - void ctk_get_actor_screen_position (CtkActor* actor, gfloat *x, gfloat *y, gfloat *width, gfloat *height, ClutterVertex vertex[4]); G_END_DECLS diff -Nru clutk-0.3.32/clutk/ctk-layer-actor.c clutk-0.3.32+0opengles2/clutk/ctk-layer-actor.c --- clutk-0.3.32/clutk/ctk-layer-actor.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-layer-actor.c 2010-06-19 10:24:45.000000000 +0100 @@ -38,11 +38,10 @@ #include #endif -#include -#include +#include +#include #include "ctk-gfx-private.h" -#include "ctk-arb-asm-private.h" #include "ctk-actor.h" #include "ctk-layer.h" #include "ctk-layer-actor.h" @@ -132,7 +131,8 @@ continue; // skip this layer if it's invalid (e.g. sizes don't match) - if (ctk_layer_is_valid (layer)) +#if 0 + if (0/*ctk_layer_is_valid (layer)*/) { ctk_layer_get_color (layer, &color); @@ -175,6 +175,7 @@ ctk_layer_get_height (layer)); } } +#endif } } /* Restore the previous render target */ diff -Nru clutk-0.3.32/clutk/ctk-layer.c clutk-0.3.32+0opengles2/clutk/ctk-layer.c --- clutk-0.3.32/clutk/ctk-layer.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-layer.c 2010-06-19 10:23:46.000000000 +0100 @@ -35,11 +35,10 @@ #include #endif -#include -#include +#include +#include #include "ctk-gfx-private.h" -#include "ctk-arb-asm-private.h" #include "ctk-actor.h" #include "ctk-layer.h" #include "ctk-private.h" @@ -391,13 +390,15 @@ { gint unpack = 0; - glActiveTextureARB (GL_TEXTURE0); + glActiveTexture (GL_TEXTURE0); glGetIntegerv (GL_UNPACK_ALIGNMENT, &unpack); glPixelStorei (GL_UNPACK_ALIGNMENT, 1); +#ifdef GL_UNPACK_ROW_LENGTH glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); glPixelStorei (GL_UNPACK_IMAGE_HEIGHT, 0); glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0); glPixelStorei (GL_UNPACK_SKIP_ROWS, 0); +#endif glBindTexture (GL_TEXTURE_2D, tex_id); glTexImage2D (GL_TEXTURE_2D, diff -Nru clutk-0.3.32/clutk/ctk-main.c clutk-0.3.32+0opengles2/clutk/ctk-main.c --- clutk-0.3.32/clutk/ctk-main.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-main.c 2010-06-19 10:25:27.000000000 +0100 @@ -28,14 +28,13 @@ #endif #include -#include -#include +#include +#include #include #include #include "ctk-gfx-private.h" -#include "ctk-arb-asm-private.h" #include "ctk-main.h" #include "ctk-private.h" #include "../data/shaders/shaders.h" @@ -80,6 +79,7 @@ static void get_capabilities () { +#ifdef HAVE_GLEW GLenum err = glewInit(); if (GLEW_OK != err) { @@ -193,6 +193,27 @@ /*has_opengl_3_1 = GLEW_VERSION_3_1 ? TRUE : FALSE; has_opengl_3_2 = GLEW_VERSION_3_2 ? TRUE : FALSE;*/ +#else /* HAVE_GLEW */ + has_fbo = FALSE; + has_glsl = TRUE; + has_shader_objects = TRUE; + has_vertex_shader = TRUE; + has_fragment_shader = TRUE; + has_vertex_program = FALSE; + has_fragment_program = FALSE; + has_texture_non_power_of_two = FALSE; + has_texture_rectangle = TRUE; + has_opengl_1_1 = FALSE; + has_opengl_1_2 = FALSE; + has_opengl_1_3 = FALSE; + has_opengl_1_4 = FALSE; + has_opengl_1_5 = FALSE; + has_opengl_2_0 = FALSE; + has_opengl_2_1 = FALSE; + has_opengl_3_0 = FALSE; + + +#endif /* HAVE_GLEW */ /* GL_SHADING_LANGUAGE_VERSION is supported starting at OpenGL 2.0 */ const guchar* str = glGetString (GL_SHADING_LANGUAGE_VERSION); @@ -258,40 +279,7 @@ static void create_asm_shader_programs() { - if (has_vertex_program - && has_fragment_program) - { - g_shTexture_asm = ctk_create_shader_asm_program_from_source (VertexProgram_vparb, TextureProgram_fparb); - g_shTextureAlpha_asm = ctk_create_shader_asm_program_from_source (VertexProgram_vparb, TextureAlphaProgram_fparb); - g_shBlur_asm = ctk_create_shader_asm_program_from_source (VertexProgram_vparb, Gaussian7x7Program_fparb); - g_shExp_asm = ctk_create_shader_asm_program_from_source (VertexProgram_vparb, ExponentProgram_fparb); - g_shMultipassBlur_asm = ctk_create_shader_asm_program_from_source (VertexProgram_vparb, MultipassBlur_fparb); - g_shTextureMask_asm = ctk_create_shader_asm_program_from_source (VertexProgram_vparb, TextureMask_fparb); - } - else - { - g_shTexture_asm = 0; - g_shTextureAlpha_asm = 0; - g_shBlur_asm = 0; - g_shExp_asm = 0; - g_shMultipassBlur_asm = 0; - g_shTextureMask_asm = 0; - } - - if (!(g_shTexture_asm && - g_shTextureAlpha_asm && - g_shBlur_asm && - g_shExp_asm && - g_shMultipassBlur_asm && - g_shTextureMask_asm)) - { - /* Not all shaders compiled succesfully */ all_asm_shaders_compiled_and_ready = FALSE; - } - else - { - all_asm_shaders_compiled_and_ready = TRUE; - } } #if 0 @@ -625,12 +613,12 @@ ctk_delete_shader_program (g_shExp); #endif - ctk_delete_shader_asm_program (g_shTexture_asm); + /*ctk_delete_shader_asm_program (g_shTexture_asm); ctk_delete_shader_asm_program (g_shTextureAlpha_asm); ctk_delete_shader_asm_program (g_shBlur_asm); ctk_delete_shader_asm_program (g_shExp_asm); ctk_delete_shader_asm_program (g_shMultipassBlur_asm); - ctk_delete_shader_asm_program (g_shTextureMask_asm); + ctk_delete_shader_asm_program (g_shTextureMask_asm);*/ } gboolean diff -Nru clutk-0.3.32/clutk/ctk-menu.c clutk-0.3.32+0opengles2/clutk/ctk-menu.c --- clutk-0.3.32/clutk/ctk-menu.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-menu.c 2010-06-19 10:24:02.000000000 +0100 @@ -30,7 +30,7 @@ #include #include #include "ctk-gfx-private.h" -#include "ctk-arb-asm-private.h" +#include "ctk-private.h" static void clutter_container_iface_init (ClutterContainerIface *iface); @@ -195,9 +195,9 @@ priv->blurred_background_texture = 0; priv->refresh_background_texture = FALSE; CHECKGL (glGenTextures (1, &priv->blurred_background_texture)); - CHECKGL (glActiveTextureARB(GL_TEXTURE0) ); + CHECKGL (glActiveTexture(GL_TEXTURE0) ); CHECKGL (glBindTexture (GL_TEXTURE_2D, priv->blurred_background_texture)); - CHECKGL (glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL)); + CHECKGL (glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP)); @@ -416,22 +416,26 @@ clutter_actor_get_size (CLUTTER_ACTOR(stage), &stage_width, &stage_height); CHECKGL( glPixelStorei(GL_PACK_ALIGNMENT, 1) ); +#ifdef GL_PACK_ROW_LENGTH CHECKGL( glPixelStorei(GL_PACK_ROW_LENGTH, 0) ); CHECKGL( glPixelStorei(GL_PACK_IMAGE_HEIGHT, 0) ); CHECKGL( glPixelStorei(GL_PACK_SKIP_PIXELS, 0) ); CHECKGL( glPixelStorei(GL_PACK_SKIP_ROWS, 0) ); +#endif /* It does not seem rigth to use floating point values to compute a memory allocation size! */ char* pixels = g_malloc(w_int * h_int * 4); glReadPixels(x, stage_height - y - h, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels); CHECKGL( glPixelStorei(GL_UNPACK_ALIGNMENT, 1) ); +#ifdef GL_PACK_ROW_LENGTH CHECKGL( glPixelStorei(GL_UNPACK_ROW_LENGTH, 0) ); CHECKGL( glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0) ); CHECKGL( glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0) ); CHECKGL( glPixelStorei(GL_UNPACK_SKIP_ROWS, 0) ); +#endif - CHECKGL (glActiveTextureARB(GL_TEXTURE0) ); + CHECKGL (glActiveTexture(GL_TEXTURE0) ); CHECKGL( glBindTexture(GL_TEXTURE_2D, priv->blurred_background_texture) ); CHECKGL (glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels)); @@ -446,6 +450,7 @@ /* Get the current render target */ CtkRenderTarget* top_rt = ctk_effect_context_peek_render_target(fxctx); +#if 0 /* reserve 2 render targets */ CtkRenderTarget* rt0 = ctk_effect_context_grab_render_target (fxctx); CtkRenderTarget* rt1 = ctk_effect_context_grab_render_target (fxctx); @@ -499,6 +504,8 @@ ctk_effect_context_release_render_target (fxctx, rt0); ctk_effect_context_release_render_target (fxctx, rt1); +#endif + /* Restore the previous render target */ if(top_rt) { diff -Nru clutk-0.3.32/clutk/ctk-private.h clutk-0.3.32+0opengles2/clutk/ctk-private.h --- clutk-0.3.32/clutk/ctk-private.h 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-private.h 2010-06-19 10:00:43.000000000 +0100 @@ -20,12 +20,35 @@ #ifndef _CTK_PRIVATE_H_ #define _CTK_PRIVATE_H_ +#include +#include + G_BEGIN_DECLS #define CTK_PARAM_READWRITE \ (G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_NICK | \ G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB) +#ifndef GL_CLAMP +#define GL_CLAMP GL_CLAMP_TO_EDGE +#endif + +#ifndef GL_BLEND_SRC +#define GL_BLEND_SRC GL_BLEND_SRC_RGB +#endif + +#ifndef GL_BLEND_DST +#define GL_BLEND_DST GL_BLEND_DST_RGB +#endif + +#ifndef GL_RGBA8 +#define GL_RGBA8 GL_RGBA +#endif + +#ifndef GL_RGB8 +#define GL_RGB8 GL_RGB +#endif + /** * CtkCapability: * @CTK_CAPABILITY_FBO: GPU has FBO support diff -Nru clutk-0.3.32/clutk/ctk-render-target.c clutk-0.3.32+0opengles2/clutk/ctk-render-target.c --- clutk-0.3.32/clutk/ctk-render-target.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-render-target.c 2010-06-19 10:00:43.000000000 +0100 @@ -37,9 +37,10 @@ #include "ctk-render-target.h" #include -#include -#include +#include +#include +#include "ctk-private.h" #include "ctk-utils.h" struct _CtkRenderTarget @@ -125,9 +126,9 @@ if (G_LIKELY (self)) { - CHECKGL (glGenFramebuffersEXT (1, &self->fbo)); - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, self->fbo)); - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0)); + CHECKGL (glGenFramebuffers (1, &self->fbo)); + CHECKGL (glBindFramebuffer (GL_FRAMEBUFFER, self->fbo)); + CHECKGL (glBindFramebuffer (GL_FRAMEBUFFER, 0)); } return self; @@ -163,25 +164,25 @@ self->width = width; self->height = height; - CHECKGL (glGenFramebuffersEXT (1, &self->fbo)); - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, self->fbo)); + CHECKGL (glGenFramebuffers (1, &self->fbo)); + CHECKGL (glBindFramebuffer (GL_FRAMEBUFFER, self->fbo)); /* Depth */ if ((self->width > 0) && (self->height > 0)) { - CHECKGL (glGenRenderbuffersEXT (1, &self->depth)); - CHECKGL (glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, self->depth)); - CHECKGL (glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT, + CHECKGL (glGenRenderbuffers (1, &self->depth)); + CHECKGL (glBindRenderbuffer (GL_RENDERBUFFER, self->depth)); + CHECKGL (glRenderbufferStorage (GL_RENDERBUFFER, GL_DEPTH_COMPONENT, self->width, self->height)); - CHECKGL (glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, - GL_DEPTH_ATTACHMENT_EXT, - GL_RENDERBUFFER_EXT, + CHECKGL (glFramebufferRenderbuffer (GL_FRAMEBUFFER, + GL_DEPTH_ATTACHMENT, + GL_RENDERBUFFER, self->depth)); /* Color */ - CHECKGL( glActiveTextureARB(GL_TEXTURE0) ); + CHECKGL( glActiveTexture(GL_TEXTURE0) ); CHECKGL (glGenTextures (1, &self->texture)); CHECKGL (glBindTexture (GL_TEXTURE_2D, self->texture)); CHECKGL (glTexImage2D (GL_TEXTURE_2D, @@ -205,8 +206,8 @@ CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP)); - CHECKGL (glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, + CHECKGL (glFramebufferTexture2D (GL_FRAMEBUFFER, + GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->texture, 0)); @@ -217,14 +218,14 @@ self->depth = 0; } - status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT); - CHECKGL_MSG ("glCheckFramebufferStatusEXT"); - if (status != GL_FRAMEBUFFER_COMPLETE_EXT) + status = glCheckFramebufferStatus (GL_FRAMEBUFFER); + CHECKGL_MSG ("glCheckFramebufferStatus"); + if (status != GL_FRAMEBUFFER_COMPLETE) { g_critical ("FBO Error: %d\n", status); } - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0)); + CHECKGL (glBindFramebuffer (GL_FRAMEBUFFER, 0)); } return self; @@ -256,18 +257,18 @@ self->width = width; self->height = height; - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, self->fbo)); + CHECKGL (glBindFramebuffer (GL_FRAMEBUFFER, self->fbo)); if (self->depth) { - CHECKGL (glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, self->depth)); - CHECKGL (glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT, + CHECKGL (glBindRenderbuffer (GL_RENDERBUFFER, self->depth)); + CHECKGL (glRenderbufferStorage (GL_RENDERBUFFER, GL_DEPTH_COMPONENT, self->width, self->height)); - CHECKGL (glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, - GL_DEPTH_ATTACHMENT_EXT, - GL_RENDERBUFFER_EXT, + CHECKGL (glFramebufferRenderbuffer (GL_FRAMEBUFFER, + GL_DEPTH_ATTACHMENT, + GL_RENDERBUFFER, self->depth)); } @@ -296,8 +297,8 @@ CHECKGL (glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP)); - CHECKGL (glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, + CHECKGL (glFramebufferTexture2D (GL_FRAMEBUFFER, + GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->texture, 0)); @@ -320,9 +321,9 @@ if (self->texture) CHECKGL (glDeleteTextures (1, &self->texture)); if (self->depth) - CHECKGL (glDeleteRenderbuffersEXT (1, &self->depth)); + CHECKGL (glDeleteRenderbuffers (1, &self->depth)); if (self->fbo) - CHECKGL (glDeleteFramebuffersEXT (1, &self->fbo)); + CHECKGL (glDeleteFramebuffers (1, &self->fbo)); g_slice_free (CtkRenderTarget, self); } @@ -342,25 +343,25 @@ g_return_if_fail (self); - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, self->fbo)); + CHECKGL (glBindFramebuffer (GL_FRAMEBUFFER, self->fbo)); if (self->texture) - CHECKGL (glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, + CHECKGL (glFramebufferTexture2D (GL_FRAMEBUFFER, + GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->texture, 0)); if (self->depth) - CHECKGL (glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, - GL_DEPTH_ATTACHMENT_EXT, - GL_RENDERBUFFER_EXT, + CHECKGL (glFramebufferRenderbuffer (GL_FRAMEBUFFER, + GL_DEPTH_ATTACHMENT, + GL_RENDERBUFFER, self->depth)); - status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT); - CHECKGL_MSG ("glCheckFramebufferStatusEXT"); - if (status != GL_FRAMEBUFFER_COMPLETE_EXT) + status = glCheckFramebufferStatus (GL_FRAMEBUFFER); + CHECKGL_MSG ("glCheckFramebufferStatus"); + if (status != GL_FRAMEBUFFER_COMPLETE) { g_critical ("Incomplete render target: %d", status); } @@ -382,7 +383,7 @@ void ctk_render_target_unbind (void) { - CHECKGL (glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0)); + CHECKGL (glBindFramebuffer (GL_FRAMEBUFFER, 0)); } diff -Nru clutk-0.3.32/clutk/ctk-utils.c clutk-0.3.32+0opengles2/clutk/ctk-utils.c --- clutk-0.3.32/clutk/ctk-utils.c 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/ctk-utils.c 2010-06-19 10:00:43.000000000 +0100 @@ -36,8 +36,8 @@ #include #include -#include -#include +#include +#include #include #include "ctk-utils.h" @@ -74,6 +74,7 @@ line); break; +#ifdef HAVE_OPENGL case GL_STACK_OVERFLOW: g_warning ("[CheckGLError] " "GL_STACK_OVERFLOW error in File %s at line: %d", @@ -87,6 +88,7 @@ file, line); break; +#endif case GL_OUT_OF_MEMORY: g_warning ("[CheckGLError] " diff -Nru clutk-0.3.32/clutk/Makefile.am clutk-0.3.32+0opengles2/clutk/Makefile.am --- clutk-0.3.32/clutk/Makefile.am 2010-06-09 10:04:09.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/Makefile.am 2010-06-19 10:33:04.000000000 +0100 @@ -105,7 +105,8 @@ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED + -DGTK_DISABLE_DEPRECATED \ + -I/usr/include/GLES2 AM_CPPFLAGS = \ $(CAIRO_CFLAGS) \ @@ -119,16 +120,14 @@ # please, keep the list sorted alphabetically libclutk_0_3_la_SOURCES = \ - $(srcdir)/ctk-arb-asm-private.c \ - $(srcdir)/ctk-arb-asm-private.h \ $(srcdir)/ctk-actor.c \ $(srcdir)/ctk-bin.c \ $(srcdir)/ctk-box.c \ $(srcdir)/ctk-button.c \ $(srcdir)/ctk-dnd.c \ $(srcdir)/ctk-effect.c \ - $(srcdir)/ctk-effect-blur.c \ $(srcdir)/ctk-effect-drop-shadow.c \ + $(srcdir)/ctk-effect-blur.c \ $(srcdir)/ctk-effect-context.c \ $(srcdir)/ctk-effect-glow.c \ ctk-enum-types.c \ @@ -159,7 +158,7 @@ $(CLUTTER_LIBS) \ $(CLUTTER_GTK_LIBS) \ $(GTK_LIBS) \ - -lGLEW + -lGLESv2 libclutk_0_3_la_LDFLAGS = $(CLUTK_LT_LDFLAGS) ctkheadersdir = $(includedir)/clutk-0.3/clutk diff -Nru clutk-0.3.32/clutk/Makefile.in clutk-0.3.32+0opengles2/clutk/Makefile.in --- clutk-0.3.32/clutk/Makefile.in 2010-06-10 17:21:11.000000000 +0100 +++ clutk-0.3.32+0opengles2/clutk/Makefile.in 2010-06-19 10:33:11.000000000 +0100 @@ -86,9 +86,9 @@ libclutk_0_3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_libclutk_0_3_la_OBJECTS = ctk-arb-asm-private.lo ctk-actor.lo \ - ctk-bin.lo ctk-box.lo ctk-button.lo ctk-dnd.lo ctk-effect.lo \ - ctk-effect-blur.lo ctk-effect-drop-shadow.lo \ +am_libclutk_0_3_la_OBJECTS = ctk-actor.lo ctk-bin.lo ctk-box.lo \ + ctk-button.lo ctk-dnd.lo ctk-effect.lo \ + ctk-effect-drop-shadow.lo ctk-effect-blur.lo \ ctk-effect-context.lo ctk-effect-glow.lo ctk-enum-types.lo \ ctk-focusable.lo ctk-gfx-private.lo ctk-hbox.lo \ ctk-icon-view.lo ctk-image.lo ctk-layer.lo ctk-layer-actor.lo \ @@ -207,8 +207,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ Q = @Q@ RANLIB = @RANLIB@ SED = @SED@ @@ -330,7 +328,8 @@ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED + -DGTK_DISABLE_DEPRECATED \ + -I/usr/include/GLES2 AM_CPPFLAGS = \ $(CAIRO_CFLAGS) \ @@ -344,16 +343,14 @@ # please, keep the list sorted alphabetically libclutk_0_3_la_SOURCES = \ - $(srcdir)/ctk-arb-asm-private.c \ - $(srcdir)/ctk-arb-asm-private.h \ $(srcdir)/ctk-actor.c \ $(srcdir)/ctk-bin.c \ $(srcdir)/ctk-box.c \ $(srcdir)/ctk-button.c \ $(srcdir)/ctk-dnd.c \ $(srcdir)/ctk-effect.c \ - $(srcdir)/ctk-effect-blur.c \ $(srcdir)/ctk-effect-drop-shadow.c \ + $(srcdir)/ctk-effect-blur.c \ $(srcdir)/ctk-effect-context.c \ $(srcdir)/ctk-effect-glow.c \ ctk-enum-types.c \ @@ -384,7 +381,7 @@ $(CLUTTER_LIBS) \ $(CLUTTER_GTK_LIBS) \ $(GTK_LIBS) \ - -lGLEW + -lGLESv2 libclutk_0_3_la_LDFLAGS = $(CLUTK_LT_LDFLAGS) ctkheadersdir = $(includedir)/clutk-0.3/clutk @@ -478,7 +475,6 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctk-actor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctk-arb-asm-private.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctk-bin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctk-box.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctk-button.Plo@am__quote@ @@ -530,13 +526,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -ctk-arb-asm-private.lo: $(srcdir)/ctk-arb-asm-private.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ctk-arb-asm-private.lo -MD -MP -MF $(DEPDIR)/ctk-arb-asm-private.Tpo -c -o ctk-arb-asm-private.lo `test -f '$(srcdir)/ctk-arb-asm-private.c' || echo '$(srcdir)/'`$(srcdir)/ctk-arb-asm-private.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ctk-arb-asm-private.Tpo $(DEPDIR)/ctk-arb-asm-private.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/ctk-arb-asm-private.c' object='ctk-arb-asm-private.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ctk-arb-asm-private.lo `test -f '$(srcdir)/ctk-arb-asm-private.c' || echo '$(srcdir)/'`$(srcdir)/ctk-arb-asm-private.c - ctk-actor.lo: $(srcdir)/ctk-actor.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ctk-actor.lo -MD -MP -MF $(DEPDIR)/ctk-actor.Tpo -c -o ctk-actor.lo `test -f '$(srcdir)/ctk-actor.c' || echo '$(srcdir)/'`$(srcdir)/ctk-actor.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ctk-actor.Tpo $(DEPDIR)/ctk-actor.Plo @@ -579,13 +568,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ctk-effect.lo `test -f '$(srcdir)/ctk-effect.c' || echo '$(srcdir)/'`$(srcdir)/ctk-effect.c -ctk-effect-blur.lo: $(srcdir)/ctk-effect-blur.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ctk-effect-blur.lo -MD -MP -MF $(DEPDIR)/ctk-effect-blur.Tpo -c -o ctk-effect-blur.lo `test -f '$(srcdir)/ctk-effect-blur.c' || echo '$(srcdir)/'`$(srcdir)/ctk-effect-blur.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ctk-effect-blur.Tpo $(DEPDIR)/ctk-effect-blur.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/ctk-effect-blur.c' object='ctk-effect-blur.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ctk-effect-blur.lo `test -f '$(srcdir)/ctk-effect-blur.c' || echo '$(srcdir)/'`$(srcdir)/ctk-effect-blur.c - ctk-effect-drop-shadow.lo: $(srcdir)/ctk-effect-drop-shadow.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ctk-effect-drop-shadow.lo -MD -MP -MF $(DEPDIR)/ctk-effect-drop-shadow.Tpo -c -o ctk-effect-drop-shadow.lo `test -f '$(srcdir)/ctk-effect-drop-shadow.c' || echo '$(srcdir)/'`$(srcdir)/ctk-effect-drop-shadow.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ctk-effect-drop-shadow.Tpo $(DEPDIR)/ctk-effect-drop-shadow.Plo @@ -593,6 +575,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ctk-effect-drop-shadow.lo `test -f '$(srcdir)/ctk-effect-drop-shadow.c' || echo '$(srcdir)/'`$(srcdir)/ctk-effect-drop-shadow.c +ctk-effect-blur.lo: $(srcdir)/ctk-effect-blur.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ctk-effect-blur.lo -MD -MP -MF $(DEPDIR)/ctk-effect-blur.Tpo -c -o ctk-effect-blur.lo `test -f '$(srcdir)/ctk-effect-blur.c' || echo '$(srcdir)/'`$(srcdir)/ctk-effect-blur.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ctk-effect-blur.Tpo $(DEPDIR)/ctk-effect-blur.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/ctk-effect-blur.c' object='ctk-effect-blur.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ctk-effect-blur.lo `test -f '$(srcdir)/ctk-effect-blur.c' || echo '$(srcdir)/'`$(srcdir)/ctk-effect-blur.c + ctk-effect-context.lo: $(srcdir)/ctk-effect-context.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ctk-effect-context.lo -MD -MP -MF $(DEPDIR)/ctk-effect-context.Tpo -c -o ctk-effect-context.lo `test -f '$(srcdir)/ctk-effect-context.c' || echo '$(srcdir)/'`$(srcdir)/ctk-effect-context.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ctk-effect-context.Tpo $(DEPDIR)/ctk-effect-context.Plo diff -Nru clutk-0.3.32/config.guess clutk-0.3.32+0opengles2/config.guess --- clutk-0.3.32/config.guess 2010-06-10 17:21:11.000000000 +0100 +++ clutk-0.3.32+0opengles2/config.guess 2010-06-19 10:09:29.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,9 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -334,9 +333,6 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -811,12 +807,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:*) + *:Interix*:[3456]*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - authenticamd | genuineintel | EM64T) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -858,20 +854,6 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -894,17 +876,6 @@ frv:Linux:*:*) echo frv-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -930,18 +901,39 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -950,11 +942,8 @@ *) echo hppa-unknown-linux-gnu ;; esac exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -977,6 +966,58 @@ xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1206,16 +1247,6 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff -Nru clutk-0.3.32/config.sub clutk-0.3.32+0opengles2/config.sub --- clutk-0.3.32/config.sub 2010-06-10 17:21:11.000000000 +0100 +++ clutk-0.3.32+0opengles2/config.sub 2010-06-19 10:09:29.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,16 +32,13 @@ # Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -75,9 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -153,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -288,7 +284,6 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -296,14 +291,13 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ - | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) + m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -346,7 +340,7 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -374,17 +368,15 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | romp-* | rs6000-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ - | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ @@ -734,9 +726,6 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) - basic_machine=microblaze-xilinx - ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1087,11 +1076,6 @@ basic_machine=tic6x-unknown os=-coff ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) basic_machine=tile-unknown os=-linux-gnu @@ -1263,9 +1247,6 @@ # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1287,8 +1268,8 @@ # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1309,7 +1290,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1442,8 +1423,6 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; -none) ;; *) diff -Nru clutk-0.3.32/configure clutk-0.3.32+0opengles2/configure --- clutk-0.3.32/configure 2010-06-10 17:21:10.000000000 +0100 +++ clutk-0.3.32+0opengles2/configure 2010-06-19 10:09:28.000000000 +0100 @@ -789,8 +789,6 @@ CLUTTER_GTK_CFLAGS CLUTTER_LIBS CLUTTER_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH PKG_CONFIG GLIB_GENMARSHAL LIBOBJS @@ -935,8 +933,6 @@ CPPFLAGS CPP PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR CLUTTER_CFLAGS CLUTTER_LIBS CLUTTER_GTK_CFLAGS @@ -1600,10 +1596,6 @@ you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path CLUTTER_CFLAGS C compiler flags for CLUTTER, overriding pkg-config CLUTTER_LIBS @@ -4753,13 +4745,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4756: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4748: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4759: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4751: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4762: output\"" >&5) + (eval echo "\"\$as_me:4754: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5965,7 +5957,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5968 "configure"' > conftest.$ac_ext + echo '#line 5960 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7465,11 +7457,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7468: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7460: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7472: \$? = $ac_status" >&5 + echo "$as_me:7464: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7804,11 +7796,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7807: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7799: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7811: \$? = $ac_status" >&5 + echo "$as_me:7803: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7909,11 +7901,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7912: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7904: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7916: \$? = $ac_status" >&5 + echo "$as_me:7908: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7964,11 +7956,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7967: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7959: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7971: \$? = $ac_status" >&5 + echo "$as_me:7963: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10348,7 +10340,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10351 "configure" +#line 10343 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10444,7 +10436,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10447 "configure" +#line 10439 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11249,10 +11241,6 @@ - - - - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -11365,16 +11353,18 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi + fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER" >&5 $as_echo_n "checking for CLUTTER... " >&6; } -if test -n "$CLUTTER_CFLAGS"; then - pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$CLUTTER_CFLAGS"; then + pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-x11-1.0 >= 0.1.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "clutter-x11-1.0 >= 0.1.5") 2>&5 ac_status=$? @@ -11384,13 +11374,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$CLUTTER_LIBS"; then - pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$CLUTTER_LIBS"; then + pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-x11-1.0 >= 0.1.5\""; } >&5 ($PKG_CONFIG --exists --print-errors "clutter-x11-1.0 >= 0.1.5") 2>&5 ac_status=$? @@ -11400,15 +11392,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -11416,9 +11407,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-x11-1.0 >= 0.1.5" 2>&1` + CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "clutter-x11-1.0 >= 0.1.5"` else - CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-x11-1.0 >= 0.1.5" 2>&1` + CLUTTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "clutter-x11-1.0 >= 0.1.5"` fi # Put the nasty error message in config.log where it belongs echo "$CLUTTER_PKG_ERRORS" >&5 @@ -11432,10 +11423,9 @@ Alternatively, you may set the environment variables CLUTTER_CFLAGS and CLUTTER_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "The pkg-config script could not be found or is too old. Make sure it @@ -11453,7 +11443,7 @@ CLUTTER_LIBS=$pkg_cv_CLUTTER_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -11463,10 +11453,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER_GTK" >&5 $as_echo_n "checking for CLUTTER_GTK... " >&6; } -if test -n "$CLUTTER_GTK_CFLAGS"; then - pkg_cv_CLUTTER_GTK_CFLAGS="$CLUTTER_GTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$CLUTTER_GTK_CFLAGS"; then + pkg_cv_CLUTTER_GTK_CFLAGS="$CLUTTER_GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-0.10 >= 0.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "clutter-gtk-0.10 >= 0.10.0") 2>&5 ac_status=$? @@ -11476,13 +11467,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$CLUTTER_GTK_LIBS"; then - pkg_cv_CLUTTER_GTK_LIBS="$CLUTTER_GTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$CLUTTER_GTK_LIBS"; then + pkg_cv_CLUTTER_GTK_LIBS="$CLUTTER_GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-0.10 >= 0.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "clutter-gtk-0.10 >= 0.10.0") 2>&5 ac_status=$? @@ -11492,15 +11485,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -11508,9 +11500,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-gtk-0.10 >= 0.10.0" 2>&1` + CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "clutter-gtk-0.10 >= 0.10.0"` else - CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-gtk-0.10 >= 0.10.0" 2>&1` + CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "clutter-gtk-0.10 >= 0.10.0"` fi # Put the nasty error message in config.log where it belongs echo "$CLUTTER_GTK_PKG_ERRORS" >&5 @@ -11524,10 +11516,9 @@ Alternatively, you may set the environment variables CLUTTER_GTK_CFLAGS and CLUTTER_GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "The pkg-config script could not be found or is too old. Make sure it @@ -11545,7 +11536,7 @@ CLUTTER_GTK_LIBS=$pkg_cv_CLUTTER_GTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -11555,10 +11546,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 $as_echo_n "checking for CAIRO... " >&6; } -if test -n "$CAIRO_CFLAGS"; then - pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$CAIRO_CFLAGS"; then + pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.8.8\""; } >&5 ($PKG_CONFIG --exists --print-errors "cairo >= 1.8.8") 2>&5 ac_status=$? @@ -11568,13 +11560,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$CAIRO_LIBS"; then - pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$CAIRO_LIBS"; then + pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.8.8\""; } >&5 ($PKG_CONFIG --exists --print-errors "cairo >= 1.8.8") 2>&5 ac_status=$? @@ -11584,15 +11578,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -11600,9 +11593,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo >= 1.8.8" 2>&1` + CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= 1.8.8"` else - CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo >= 1.8.8" 2>&1` + CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= 1.8.8"` fi # Put the nasty error message in config.log where it belongs echo "$CAIRO_PKG_ERRORS" >&5 @@ -11616,10 +11609,9 @@ Alternatively, you may set the environment variables CAIRO_CFLAGS and CAIRO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "The pkg-config script could not be found or is too old. Make sure it @@ -11637,7 +11629,7 @@ CAIRO_LIBS=$pkg_cv_CAIRO_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -11647,10 +11639,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } -if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14") 2>&5 ac_status=$? @@ -11660,13 +11653,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14") 2>&5 ac_status=$? @@ -11676,15 +11671,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -11692,9 +11686,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.14" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.14"` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.14" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.14"` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 @@ -11708,10 +11702,9 @@ Alternatively, you may set the environment variables GTK_CFLAGS and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "The pkg-config script could not be found or is too old. Make sure it @@ -11729,7 +11722,7 @@ GTK_LIBS=$pkg_cv_GTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi diff -Nru clutk-0.3.32/data/Makefile.in clutk-0.3.32+0opengles2/data/Makefile.in --- clutk-0.3.32/data/Makefile.in 2010-06-10 17:21:11.000000000 +0100 +++ clutk-0.3.32+0opengles2/data/Makefile.in 2010-06-19 10:09:29.000000000 +0100 @@ -181,8 +181,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ Q = @Q@ RANLIB = @RANLIB@ SED = @SED@ diff -Nru clutk-0.3.32/data/shaders/Makefile.in clutk-0.3.32+0opengles2/data/shaders/Makefile.in --- clutk-0.3.32/data/shaders/Makefile.in 2010-06-10 17:21:11.000000000 +0100 +++ clutk-0.3.32+0opengles2/data/shaders/Makefile.in 2010-06-19 10:09:29.000000000 +0100 @@ -166,8 +166,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ Q = @Q@ RANLIB = @RANLIB@ SED = @SED@ diff -Nru clutk-0.3.32/debian/changelog clutk-0.3.32+0opengles2/debian/changelog --- clutk-0.3.32/debian/changelog 2010-06-19 10:48:18.000000000 +0100 +++ clutk-0.3.32+0opengles2/debian/changelog 2010-06-19 10:48:18.000000000 +0100 @@ -1,3 +1,10 @@ +clutk (0.3.32+0opengles2-0ubuntu1~lucid.armel1) lucid; urgency=low + + * opengles/no-asm-shaders build for armel1 ppa from + lp:~asac/+junk/clutk.no-asm-shaders branch + + -- Alexander Sack Sat, 19 Jun 2010 11:17:55 +0200 + clutk (0.3.32-0ubuntu1~lucid) lucid; urgency=low * Backport for lucid UNE ppa users diff -Nru clutk-0.3.32/debian/control clutk-0.3.32+0opengles2/debian/control --- clutk-0.3.32/debian/control 2010-06-19 10:48:18.000000000 +0100 +++ clutk-0.3.32+0opengles2/debian/control 2010-06-19 10:48:18.000000000 +0100 @@ -5,14 +5,14 @@ Build-Depends: debhelper (>= 7), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.14), - libclutter-1.0-dev (>= 0.1.5), - libclutter-gtk-0.10-dev (>= 0.10.0), + libclutter-eglx-es20-1.0-dev, + libclutter-gtk-0.10-dev (>= 0.10.4-0ubuntu2~armel1), libglew1.5-dev, libcairo2-dev (>= 1.8.8), gtk-doc-tools, gobject-introspection (>= 0.6.5), gir1.0-atk-1.0, - gir1.0-clutter-1.0, + gir1.0-clutter-eglx-1.0, libgirepository1.0-dev, gir1.0-glib-2.0, gir1.0-gtk-2.0, @@ -39,7 +39,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libclutk-0.3-0 (= ${binary:Version}), - libclutter-1.0-dev, + libclutter-eglx-es20-1.0-dev, libclutter-gtk-0.10-dev, libgtk2.0-dev, libglew1.5-dev, diff -Nru clutk-0.3.32/doc/Makefile.in clutk-0.3.32+0opengles2/doc/Makefile.in --- clutk-0.3.32/doc/Makefile.in 2010-06-10 17:21:11.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/Makefile.in 2010-06-19 10:09:29.000000000 +0100 @@ -181,8 +181,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ Q = @Q@ RANLIB = @RANLIB@ SED = @SED@ diff -Nru clutk-0.3.32/doc/reference/clutk/clutk-sections.txt clutk-0.3.32+0opengles2/doc/reference/clutk/clutk-sections.txt --- clutk-0.3.32/doc/reference/clutk/clutk-sections.txt 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/clutk-sections.txt 2010-06-19 10:33:20.000000000 +0100 @@ -1,4 +1,73 @@
+ctk-box +CtkBox +CtkBox +CtkBoxClass +CtkBoxPrivate +CtkBoxChild +ctk_box_pack +ctk_box_set_homogeneous +ctk_box_get_homogeneous +ctk_box_set_spacing +ctk_box_get_spacing +ctk_box_set_orientation +ctk_box_get_orientation +ctk_box_sort_children + +CTK_BOX +CTK_IS_BOX +CTK_TYPE_BOX +ctk_box_get_type +CTK_BOX_CLASS +CTK_IS_BOX_CLASS +CTK_BOX_GET_CLASS +
+ +
+ctk-icon-view +CtkIconView +CtkIconView +CtkIconViewClass +CtkIconViewPrivate +ctk_icon_view_new +ctk_icon_view_set_spacing +ctk_icon_view_get_spacing + +CTK_ICON_VIEW +CTK_IS_ICON_VIEW +CTK_TYPE_ICON_VIEW +ctk_icon_view_get_type +CTK_ICON_VIEW_CLASS +CTK_IS_ICON_VIEW_CLASS +CTK_ICON_VIEW_GET_CLASS +
+ +
+ctk-effect-glow +CtkEffectGlow +CTK_EFFECT_GLOW_MIN_FACTOR +CTK_EFFECT_GLOW_MAX_FACTOR +CTK_EFFECT_GLOW_DEFAULT_FACTOR +CtkEffectGlow +CtkEffectGlowClass +CtkEffectGlowPrivate +ctk_effect_glow_new +ctk_effect_glow_set_factor +ctk_effect_glow_get_factor +ctk_effect_glow_set_color +ctk_effect_glow_get_color +ctk_effect_glow_set_background_texture + +CTK_EFFECT_GLOW +CTK_IS_EFFECT_GLOW +CTK_TYPE_EFFECT_GLOW +ctk_effect_glow_get_type +CTK_EFFECT_GLOW_CLASS +CTK_IS_EFFECT_GLOW_CLASS +CTK_EFFECT_GLOW_GET_CLASS +
+ +
ctk-effect CtkEffect CTK_EFFECT_MIN_MARGIN @@ -38,19 +107,80 @@
-ctk-hbox -CtkHBox -CtkHBox -CtkHBoxClass -ctk_hbox_new +ctk-tooltip +CtkTooltip +CtkTooltip +CtkTooltipClass +CtkTooltipPrivate +ctk_tooltip_new +ctk_tooltip_set_actor +ctk_tooltip_get_actor +ctk_tooltip_set_label +ctk_tooltip_get_label +ctk_tooltip_show +ctk_tooltip_hide -CTK_HBOX -CTK_IS_HBOX -CTK_TYPE_HBOX -ctk_hbox_get_type -CTK_HBOX_CLASS -CTK_IS_HBOX_CLASS -CTK_HBOX_GET_CLASS +CTK_TOOLTIP +CTK_IS_TOOLTIP +CTK_TYPE_TOOLTIP +ctk_tooltip_get_type +CTK_TOOLTIP_CLASS +CTK_IS_TOOLTIP_CLASS +CTK_TOOLTIP_GET_CLASS +
+ +
+ctk-effect-drop-shadow +CtkEffectDropShadow +CTK_EFFECT_DROP_SHADOW_MIN_SIZE +CTK_EFFECT_DROP_SHADOW_MAX_SIZE +CTK_EFFECT_DROP_SHADOW_DEFAULT_SIZE +CTK_EFFECT_DROP_SHADOW_MIN_OFFSET_X +CTK_EFFECT_DROP_SHADOW_MAX_OFFSET_X +CTK_EFFECT_DROP_SHADOW_DEFAULT_OFFSET_X +CTK_EFFECT_DROP_SHADOW_MIN_OFFSET_Y +CTK_EFFECT_DROP_SHADOW_MAX_OFFSET_Y +CTK_EFFECT_DROP_SHADOW_DEFAULT_OFFSET_Y +CtkEffectDropShadow +CtkEffectDropShadowClass +CtkEffectDropShadowPrivate +ctk_effect_drop_shadow_new +ctk_effect_drop_shadow_set_blur_factor +ctk_effect_drop_shadow_get_blur_factor +ctk_effect_drop_shadow_set_offset_x +ctk_effect_drop_shadow_get_offset_x +ctk_effect_drop_shadow_set_offset_y +ctk_effect_drop_shadow_get_offset_y + +CTK_EFFECT_DROP_SHADOW +CTK_IS_EFFECT_DROP_SHADOW +CTK_TYPE_EFFECT_DROP_SHADOW +ctk_effect_drop_shadow_get_type +CTK_EFFECT_DROP_SHADOW_CLASS +CTK_IS_EFFECT_DROP_SHADOW_CLASS +CTK_EFFECT_DROP_SHADOW_GET_CLASS +
+ +
+ctk-effect-blur +CtkEffectBlur +CTK_EFFECT_BLUR_MIN_FACTOR +CTK_EFFECT_BLUR_MAX_FACTOR +CTK_EFFECT_BLUR_DEFAULT_FACTOR +CtkEffectBlur +CtkEffectBlurClass +CtkEffectBlurPrivate +ctk_effect_blur_new +ctk_effect_blur_set_factor +ctk_effect_blur_get_factor + +CTK_EFFECT_BLUR +CTK_IS_EFFECT_BLUR +CTK_TYPE_EFFECT_BLUR +ctk_effect_blur_get_type +CTK_EFFECT_BLUR_CLASS +CTK_IS_EFFECT_BLUR_CLASS +CTK_EFFECT_BLUR_GET_CLASS
@@ -74,6 +204,32 @@
+ctk-effect-context +CtkEffectContext +CtkEffectContext +CtkEffectContextClass +CtkEffectContextPrivate +ctk_effect_context_get_default_for_stage +ctk_effect_context_get_default_for_actor +ctk_effect_context_grab_render_target_for_size +ctk_effect_context_grab_render_target_for_actor +ctk_effect_context_grab_render_target +ctk_effect_context_release_render_target +ctk_effect_context_push_render_target +ctk_effect_context_pop_render_target +ctk_effect_context_peek_render_target +ctk_effect_context_get_utility_render_target + +CTK_EFFECT_CONTEXT +CTK_IS_EFFECT_CONTEXT +CTK_TYPE_EFFECT_CONTEXT +ctk_effect_context_get_type +CTK_EFFECT_CONTEXT_CLASS +CTK_IS_EFFECT_CONTEXT_CLASS +CTK_EFFECT_CONTEXT_GET_CLASS +
+ +
ctk-actor CtkActor CtkActor @@ -112,256 +268,52 @@
-ctk-toplevel -CtkToplevel -CtkToplevel -CtkToplevelClass -CtkToplevelPrivate -ctk_toplevel_get_default_for_stage -ctk_toplevel_set_focus -ctk_toplevel_get_stage +ctk-image +CtkImage +CtkImage +CtkImageClass +CtkImagePrivate +CtkImageType +ctk_image_new +ctk_image_new_from_pixbuf +ctk_image_new_from_stock +ctk_image_new_from_icon_name +ctk_image_new_from_gicon +ctk_image_new_from_filename +ctk_image_get_image_storage_type +ctk_image_set_size +ctk_image_get_size +ctk_image_set_from_pixbuf +ctk_image_set_from_stock +ctk_image_set_from_icon_name +ctk_image_set_from_gicon +ctk_image_set_from_filename +ctk_image_get_pixbuf +ctk_image_get_stock +ctk_image_get_icon_name +ctk_image_get_gicon +ctk_image_get_filename -CTK_TOPLEVEL -CTK_IS_TOPLEVEL -CTK_TYPE_TOPLEVEL -ctk_toplevel_get_type -CTK_TOPLEVEL_CLASS -CTK_IS_TOPLEVEL_CLASS -CTK_TOPLEVEL_GET_CLASS +CTK_IMAGE +CTK_IS_IMAGE +CTK_TYPE_IMAGE +ctk_image_get_type +CTK_IMAGE_CLASS +CTK_IS_IMAGE_CLASS +CTK_IMAGE_GET_CLASS
-ctk-text -CtkText -CtkText -CtkTextClass -CtkTextPrivate -ctk_text_new -ctk_text_set_alignment -ctk_text_get_alignment +ctk-focusable +CtkFocusable +CtkFocusable +CtkFocusableIface +CtkFocusDirection -CTK_TEXT -CTK_IS_TEXT -CTK_TYPE_TEXT -ctk_text_get_type -CTK_TEXT_CLASS -CTK_IS_TEXT_CLASS -CTK_TEXT_GET_CLASS -
- -
-ctk-tooltip -CtkTooltip -CtkTooltip -CtkTooltipClass -CtkTooltipPrivate -ctk_tooltip_new -ctk_tooltip_set_actor -ctk_tooltip_get_actor -ctk_tooltip_set_label -ctk_tooltip_get_label -ctk_tooltip_show -ctk_tooltip_hide - -CTK_TOOLTIP -CTK_IS_TOOLTIP -CTK_TYPE_TOOLTIP -ctk_tooltip_get_type -CTK_TOOLTIP_CLASS -CTK_IS_TOOLTIP_CLASS -CTK_TOOLTIP_GET_CLASS -
- -
-ctk-effect-context -CtkEffectContext -CtkEffectContext -CtkEffectContextClass -CtkEffectContextPrivate -ctk_effect_context_get_default_for_stage -ctk_effect_context_get_default_for_actor -ctk_effect_context_grab_render_target_for_size -ctk_effect_context_grab_render_target_for_actor -ctk_effect_context_grab_render_target -ctk_effect_context_release_render_target -ctk_effect_context_push_render_target -ctk_effect_context_pop_render_target -ctk_effect_context_peek_render_target -ctk_effect_context_get_utility_render_target - -CTK_EFFECT_CONTEXT -CTK_IS_EFFECT_CONTEXT -CTK_TYPE_EFFECT_CONTEXT -ctk_effect_context_get_type -CTK_EFFECT_CONTEXT_CLASS -CTK_IS_EFFECT_CONTEXT_CLASS -CTK_EFFECT_CONTEXT_GET_CLASS -
- -
-ctk-image -CtkImage -CtkImage -CtkImageClass -CtkImagePrivate -CtkImageType -ctk_image_new -ctk_image_new_from_pixbuf -ctk_image_new_from_stock -ctk_image_new_from_icon_name -ctk_image_new_from_gicon -ctk_image_new_from_filename -ctk_image_get_image_storage_type -ctk_image_set_size -ctk_image_get_size -ctk_image_set_from_pixbuf -ctk_image_set_from_stock -ctk_image_set_from_icon_name -ctk_image_set_from_gicon -ctk_image_set_from_filename -ctk_image_get_pixbuf -ctk_image_get_stock -ctk_image_get_icon_name -ctk_image_get_gicon -ctk_image_get_filename - -CTK_IMAGE -CTK_IS_IMAGE -CTK_TYPE_IMAGE -ctk_image_get_type -CTK_IMAGE_CLASS -CTK_IS_IMAGE_CLASS -CTK_IMAGE_GET_CLASS -
- -
-ctk-button -CtkButton -CtkButton -CtkButtonClass -CtkButtonPrivate -ctk_button_new -ctk_button_set_label -ctk_button_get_label -ctk_button_set_image -ctk_button_get_image -ctk_button_set_text -ctk_button_get_text -ctk_button_set_orientation -ctk_button_get_orientation - -CTK_BUTTON -CTK_IS_BUTTON -CTK_TYPE_BUTTON -ctk_button_get_type -CTK_BUTTON_CLASS -CTK_IS_BUTTON_CLASS -CTK_BUTTON_GET_CLASS -
- -
-ctk-menu-seperator -CtkMenuSeperator -CtkMenuSeperator -CtkMenuSeperatorClass -ctk_menu_seperator_new - -CTK_MENU_SEPERATOR -CTK_IS_MENU_SEPERATOR -CTK_TYPE_MENU_SEPERATOR -ctk_menu_seperator_get_type -CTK_MENU_SEPERATOR_CLASS -CTK_IS_MENU_SEPERATOR_CLASS -CTK_MENU_SEPERATOR_GET_CLASS -
- -
-ctk-icon-view -CtkIconView -CtkIconView -CtkIconViewClass -CtkIconViewPrivate -ctk_icon_view_new -ctk_icon_view_set_spacing -ctk_icon_view_get_spacing - -CTK_ICON_VIEW -CTK_IS_ICON_VIEW -CTK_TYPE_ICON_VIEW -ctk_icon_view_get_type -CTK_ICON_VIEW_CLASS -CTK_IS_ICON_VIEW_CLASS -CTK_ICON_VIEW_GET_CLASS -
- -
-ctk-box -CtkBox -CtkBox -CtkBoxClass -CtkBoxPrivate -CtkBoxChild -ctk_box_pack -ctk_box_set_homogeneous -ctk_box_get_homogeneous -ctk_box_set_spacing -ctk_box_get_spacing -ctk_box_set_orientation -ctk_box_get_orientation -ctk_box_sort_children - -CTK_BOX -CTK_IS_BOX -CTK_TYPE_BOX -ctk_box_get_type -CTK_BOX_CLASS -CTK_IS_BOX_CLASS -CTK_BOX_GET_CLASS -
- -
-ctk-effect-drop-shadow -CtkEffectDropShadow -CTK_EFFECT_DROP_SHADOW_MIN_SIZE -CTK_EFFECT_DROP_SHADOW_MAX_SIZE -CTK_EFFECT_DROP_SHADOW_DEFAULT_SIZE -CTK_EFFECT_DROP_SHADOW_MIN_OFFSET_X -CTK_EFFECT_DROP_SHADOW_MAX_OFFSET_X -CTK_EFFECT_DROP_SHADOW_DEFAULT_OFFSET_X -CTK_EFFECT_DROP_SHADOW_MIN_OFFSET_Y -CTK_EFFECT_DROP_SHADOW_MAX_OFFSET_Y -CTK_EFFECT_DROP_SHADOW_DEFAULT_OFFSET_Y -CtkEffectDropShadow -CtkEffectDropShadowClass -CtkEffectDropShadowPrivate -ctk_effect_drop_shadow_new -ctk_effect_drop_shadow_set_blur_factor -ctk_effect_drop_shadow_get_blur_factor -ctk_effect_drop_shadow_set_offset_x -ctk_effect_drop_shadow_get_offset_x -ctk_effect_drop_shadow_set_offset_y -ctk_effect_drop_shadow_get_offset_y - -CTK_EFFECT_DROP_SHADOW -CTK_IS_EFFECT_DROP_SHADOW -CTK_TYPE_EFFECT_DROP_SHADOW -ctk_effect_drop_shadow_get_type -CTK_EFFECT_DROP_SHADOW_CLASS -CTK_IS_EFFECT_DROP_SHADOW_CLASS -CTK_EFFECT_DROP_SHADOW_GET_CLASS -
- -
-ctk-focusable -CtkFocusable -CtkFocusable -CtkFocusableIface -CtkFocusDirection - -CTK_FOCUSABLE -CTK_IS_FOCUSABLE -CTK_TYPE_FOCUSABLE -CTK_FOCUSABLE_GET_IFACE +CTK_FOCUSABLE +CTK_IS_FOCUSABLE +CTK_TYPE_FOCUSABLE +CTK_FOCUSABLE_GET_IFACE
@@ -382,92 +334,54 @@
-ctk-layer-actor -CtkLayerActor -CtkLayerActor -CtkLayerActorClass -CtkLayerActorPrivate -ctk_layer_actor_new -ctk_layer_actor_get_width -ctk_layer_actor_set_width -ctk_layer_actor_get_height -ctk_layer_actor_set_height -ctk_layer_actor_get_num_layers -ctk_layer_actor_add_layer -ctk_layer_actor_get_layer -ctk_layer_actor_flatten -ctk_layer_actor_is_flattened - -CTK_LAYER_ACTOR -CTK_IS_LAYER_ACTOR -CTK_TYPE_LAYER_ACTOR -ctk_layer_actor_get_type -CTK_LAYER_ACTOR_CLASS -CTK_IS_LAYER_ACTOR_CLASS -CTK_LAYER_ACTOR_GET_CLASS -
- -
-ctk-effect-glow -CtkEffectGlow -CTK_EFFECT_GLOW_MIN_FACTOR -CTK_EFFECT_GLOW_MAX_FACTOR -CTK_EFFECT_GLOW_DEFAULT_FACTOR -CtkEffectGlow -CtkEffectGlowClass -CtkEffectGlowPrivate -ctk_effect_glow_new -ctk_effect_glow_set_factor -ctk_effect_glow_get_factor -ctk_effect_glow_set_color -ctk_effect_glow_get_color -ctk_effect_glow_set_background_texture - -CTK_EFFECT_GLOW -CTK_IS_EFFECT_GLOW -CTK_TYPE_EFFECT_GLOW -ctk_effect_glow_get_type -CTK_EFFECT_GLOW_CLASS -CTK_IS_EFFECT_GLOW_CLASS -CTK_EFFECT_GLOW_GET_CLASS -
- -
-ctk-effect-blur -CtkEffectBlur -CTK_EFFECT_BLUR_MIN_FACTOR -CTK_EFFECT_BLUR_MAX_FACTOR -CTK_EFFECT_BLUR_DEFAULT_FACTOR -CtkEffectBlur -CtkEffectBlurClass -CtkEffectBlurPrivate -ctk_effect_blur_new -ctk_effect_blur_set_factor -ctk_effect_blur_get_factor +ctk-menu +CtkMenu +CtkMenu +CtkMenuClass +CtkMenuPrivate +ctk_menu_new +ctk_menu_new_with_background +ctk_menu_set_spacing +ctk_menu_get_spacing +ctk_menu_get_num_items +ctk_menu_append +ctk_menu_prepend +ctk_menu_attach_to_actor +ctk_menu_get_attached_actor +ctk_menu_set_color +ctk_menu_set_background +ctk_menu_get_background +ctk_menu_set_detect_clicks +ctk_menu_set_swallow_clicks +ctk_menu_remove_all +ctk_menu_refresh_background_texture +ctk_menu_get_framebuffer_background +ctk_menu_get_close_on_leave +ctk_menu_set_close_on_leave -CTK_EFFECT_BLUR -CTK_IS_EFFECT_BLUR -CTK_TYPE_EFFECT_BLUR -ctk_effect_blur_get_type -CTK_EFFECT_BLUR_CLASS -CTK_IS_EFFECT_BLUR_CLASS -CTK_EFFECT_BLUR_GET_CLASS +CTK_MENU +CTK_IS_MENU +CTK_TYPE_MENU +ctk_menu_get_type +CTK_MENU_CLASS +CTK_IS_MENU_CLASS +CTK_MENU_GET_CLASS
-ctk-vbox -CtkVBox -CtkVBox -CtkVBoxClass -ctk_vbox_new +ctk-hbox +CtkHBox +CtkHBox +CtkHBoxClass +ctk_hbox_new -CTK_VBOX -CTK_IS_VBOX -CTK_TYPE_VBOX -ctk_vbox_get_type -CTK_VBOX_CLASS -CTK_IS_VBOX_CLASS -CTK_VBOX_GET_CLASS +CTK_HBOX +CTK_IS_HBOX +CTK_TYPE_HBOX +ctk_hbox_get_type +CTK_HBOX_CLASS +CTK_IS_HBOX_CLASS +CTK_HBOX_GET_CLASS
@@ -492,64 +406,29 @@ ctk_layer_get_mask_pixbuf ctk_layer_set_image_from_file ctk_layer_set_image_from_pixbuf -ctk_layer_set_image_from_surface -ctk_layer_set_mask_from_file -ctk_layer_set_mask_from_pixbuf -ctk_layer_set_mask_from_surface -ctk_layer_set_image_from_id -ctk_layer_set_mask_from_id -ctk_layer_get_image_id -ctk_layer_get_mask_id -ctk_layer_set_image_repeat_mode -ctk_layer_get_image_repeat_mode -ctk_layer_set_mask_repeat_mode -ctk_layer_get_mask_repeat_mode -ctk_layer_is_valid -ctk_layer_get_enabled -ctk_layer_set_enabled - -CTK_LAYER -CTK_IS_LAYER -CTK_TYPE_LAYER -ctk_layer_get_type -CTK_LAYER_CLASS -CTK_IS_LAYER_CLASS -CTK_LAYER_GET_CLASS -
- -
-ctk-menu -CtkMenu -CtkMenu -CtkMenuClass -CtkMenuPrivate -ctk_menu_new -ctk_menu_new_with_background -ctk_menu_set_spacing -ctk_menu_get_spacing -ctk_menu_get_num_items -ctk_menu_append -ctk_menu_prepend -ctk_menu_attach_to_actor -ctk_menu_get_attached_actor -ctk_menu_set_color -ctk_menu_set_background -ctk_menu_get_background -ctk_menu_set_detect_clicks -ctk_menu_set_swallow_clicks -ctk_menu_remove_all -ctk_menu_refresh_background_texture -ctk_menu_get_framebuffer_background -ctk_menu_get_close_on_leave -ctk_menu_set_close_on_leave +ctk_layer_set_image_from_surface +ctk_layer_set_mask_from_file +ctk_layer_set_mask_from_pixbuf +ctk_layer_set_mask_from_surface +ctk_layer_set_image_from_id +ctk_layer_set_mask_from_id +ctk_layer_get_image_id +ctk_layer_get_mask_id +ctk_layer_set_image_repeat_mode +ctk_layer_get_image_repeat_mode +ctk_layer_set_mask_repeat_mode +ctk_layer_get_mask_repeat_mode +ctk_layer_is_valid +ctk_layer_get_enabled +ctk_layer_set_enabled -CTK_MENU -CTK_IS_MENU -CTK_TYPE_MENU -ctk_menu_get_type -CTK_MENU_CLASS -CTK_IS_MENU_CLASS -CTK_MENU_GET_CLASS +CTK_LAYER +CTK_IS_LAYER +CTK_TYPE_LAYER +ctk_layer_get_type +CTK_LAYER_CLASS +CTK_IS_LAYER_CLASS +CTK_LAYER_GET_CLASS
@@ -579,16 +458,134 @@
-ctk-private -CTK_PARAM_READWRITE -CtkCapability -CtkOpenGLVersion -CtkGLSLVersion -ctk_has_capability -ctk_has_opengl_version -ctk_has_glsl_version -ctk_glsl_shaders_compiled_and_ready -ctk_asm_shaders_compiled_and_ready +ctk-layer-actor +CtkLayerActor +CtkLayerActor +CtkLayerActorClass +CtkLayerActorPrivate +ctk_layer_actor_new +ctk_layer_actor_get_width +ctk_layer_actor_set_width +ctk_layer_actor_get_height +ctk_layer_actor_set_height +ctk_layer_actor_get_num_layers +ctk_layer_actor_add_layer +ctk_layer_actor_get_layer +ctk_layer_actor_flatten +ctk_layer_actor_is_flattened + +CTK_LAYER_ACTOR +CTK_IS_LAYER_ACTOR +CTK_TYPE_LAYER_ACTOR +ctk_layer_actor_get_type +CTK_LAYER_ACTOR_CLASS +CTK_IS_LAYER_ACTOR_CLASS +CTK_LAYER_ACTOR_GET_CLASS +
+ +
+ctk-toplevel +CtkToplevel +CtkToplevel +CtkToplevelClass +CtkToplevelPrivate +ctk_toplevel_get_default_for_stage +ctk_toplevel_set_focus +ctk_toplevel_get_stage + +CTK_TOPLEVEL +CTK_IS_TOPLEVEL +CTK_TYPE_TOPLEVEL +ctk_toplevel_get_type +CTK_TOPLEVEL_CLASS +CTK_IS_TOPLEVEL_CLASS +CTK_TOPLEVEL_GET_CLASS +
+ +
+ctk-menu-seperator +CtkMenuSeperator +CtkMenuSeperator +CtkMenuSeperatorClass +ctk_menu_seperator_new + +CTK_MENU_SEPERATOR +CTK_IS_MENU_SEPERATOR +CTK_TYPE_MENU_SEPERATOR +ctk_menu_seperator_get_type +CTK_MENU_SEPERATOR_CLASS +CTK_IS_MENU_SEPERATOR_CLASS +CTK_MENU_SEPERATOR_GET_CLASS +
+ +
+ctk-vbox +CtkVBox +CtkVBox +CtkVBoxClass +ctk_vbox_new + +CTK_VBOX +CTK_IS_VBOX +CTK_TYPE_VBOX +ctk_vbox_get_type +CTK_VBOX_CLASS +CTK_IS_VBOX_CLASS +CTK_VBOX_GET_CLASS +
+ +
+ctk-text +CtkText +CtkText +CtkTextClass +CtkTextPrivate +ctk_text_new +ctk_text_set_alignment +ctk_text_get_alignment + +CTK_TEXT +CTK_IS_TEXT +CTK_TYPE_TEXT +ctk_text_get_type +CTK_TEXT_CLASS +CTK_IS_TEXT_CLASS +CTK_TEXT_GET_CLASS +
+ +
+ctk-button +CtkButton +CtkButton +CtkButtonClass +CtkButtonPrivate +ctk_button_new +ctk_button_set_label +ctk_button_get_label +ctk_button_set_image +ctk_button_get_image +ctk_button_set_text +ctk_button_get_text +ctk_button_set_orientation +ctk_button_get_orientation + +CTK_BUTTON +CTK_IS_BUTTON +CTK_TYPE_BUTTON +ctk_button_get_type +CTK_BUTTON_CLASS +CTK_IS_BUTTON_CLASS +CTK_BUTTON_GET_CLASS +
+ +
+ctk-main +ctk_init +ctk_init_after +ctk_cleanup +ctk_pixel_to_em +ctk_em_to_pixel +ctk_surface_blur
@@ -648,65 +645,29 @@
-ctk-dnd -ctk_dnd_init -ctk_drag_dest_start -ctk_drag_get_data -ctk_drag_dest_find_target -ctk_drag_dest_is_dest -
- -
-ctk-utils -CHECKGL -CHECKGL_MSG -CheckGLError -
- -
-ctk-main -ctk_init -ctk_init_after -ctk_cleanup -ctk_pixel_to_em -ctk_em_to_pixel -ctk_surface_blur -
- -
-ctk-marshal -ctk_marshal_VOID__OBJECT_UINT -ctk_marshal_VOID__OBJECT -ctk_marshal_BOOLEAN__OBJECT_ENUM -ctk_marshal_BOOLEAN__OBJECT_INT_INT_UINT -ctk_marshal_VOID__OBJECT_INT_INT_UINT -ctk_marshal_VOID__OBJECT_BOXED_UINT_UINT -ctk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT -
- -
ctk-gfx-private ctk_read_shader_text_file ctk_create_shader_program_from_source ctk_delete_shader_program -ctk_render_quad_rt -ctk_render_quad -ctk_render_custom_quad -ctk_render_quad_alpha_mask -custom_render_quad_gaussian_blur_separable -custom_render_quad_texture_mask -ctk_copy_rendertarget_to_rendertarget -ctk_copy_render_target_to_cached_texture ctk_get_actor_screen_position
-ctk-types -CTK_TYPE_PADDING -ctk_padding_get_type -CtkPadding -CtkOrientation -CtkActorState +ctk-private +CTK_PARAM_READWRITE +GL_CLAMP +GL_BLEND_SRC +GL_BLEND_DST +GL_RGBA8 +GL_RGB8 +CtkCapability +CtkOpenGLVersion +CtkGLSLVersion +ctk_has_capability +ctk_has_opengl_version +ctk_has_glsl_version +ctk_glsl_shaders_compiled_and_ready +ctk_asm_shaders_compiled_and_ready
@@ -731,3 +692,39 @@ ctk_render_target_set_flags
+
+ctk-types +CTK_TYPE_PADDING +ctk_padding_get_type +CtkPadding +CtkOrientation +CtkActorState +
+ +
+ctk-utils +CHECKGL +CHECKGL_MSG +CheckGLError +
+ +
+ctk-marshal +ctk_marshal_VOID__OBJECT_UINT +ctk_marshal_VOID__OBJECT +ctk_marshal_BOOLEAN__OBJECT_ENUM +ctk_marshal_BOOLEAN__OBJECT_INT_INT_UINT +ctk_marshal_VOID__OBJECT_INT_INT_UINT +ctk_marshal_VOID__OBJECT_BOXED_UINT_UINT +ctk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT +
+ +
+ctk-dnd +ctk_dnd_init +ctk_drag_dest_start +ctk_drag_get_data +ctk_drag_dest_find_target +ctk_drag_dest_is_dest +
+ diff -Nru clutk-0.3.32/doc/reference/clutk/html/annotation-glossary.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/annotation-glossary.html --- clutk-0.3.32/doc/reference/clutk/html/annotation-glossary.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/annotation-glossary.html 2010-06-19 10:33:20.000000000 +0100 @@ -7,7 +7,7 @@ - + @@ -60,6 +60,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/api-index-full.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/api-index-full.html --- clutk-0.3.32/doc/reference/clutk/html/api-index-full.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/api-index-full.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -25,6 +25,8 @@  |  C  |  + G +  |  O @@ -882,18 +884,10 @@
-ctk_copy_rendertarget_to_rendertarget, function in ctk-gfx-private -
-
-
ctk_copy_rendertarget_to_rendertarget_asm, function in ctk-arb-asm-private
-ctk_copy_render_target_to_cached_texture, function in ctk-gfx-private -
-
-
ctk_copy_render_target_to_cached_texture_asm, function in ctk-arb-asm-private
@@ -1630,10 +1624,6 @@
-ctk_render_custom_quad, function in ctk-gfx-private -
-
-
ctk_render_custom_quad_asm, function in ctk-arb-asm-private
@@ -1650,14 +1640,6 @@
-ctk_render_quad, function in ctk-gfx-private -
-
-
-ctk_render_quad_alpha_mask, function in ctk-gfx-private -
-
-
ctk_render_quad_alpha_mask_asm, function in ctk-arb-asm-private
@@ -1666,10 +1648,6 @@
-ctk_render_quad_rt, function in ctk-gfx-private -
-
-
ctk_render_quad_rt_asm, function in ctk-arb-asm-private
@@ -1882,19 +1860,32 @@
-custom_render_quad_gaussian_blur_separable, function in ctk-gfx-private +custom_render_quad_gaussian_blur_separable_asm, function in ctk-arb-asm-private
-custom_render_quad_gaussian_blur_separable_asm, function in ctk-arb-asm-private +custom_render_quad_texture_mask_asm, function in ctk-arb-asm-private
+

G

-custom_render_quad_texture_mask, function in ctk-gfx-private +GL_BLEND_DST, macro in ctk-private
-custom_render_quad_texture_mask_asm, function in ctk-arb-asm-private +GL_BLEND_SRC, macro in ctk-private +
+
+
+GL_CLAMP, macro in ctk-private +
+
+
+GL_RGB8, macro in ctk-private +
+
+
+GL_RGBA8, macro in ctk-private

O

@@ -1905,6 +1896,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/ch01.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/ch01.html --- clutk-0.3.32/doc/reference/clutk/html/ch01.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/ch01.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@

-Clutk

+Clutk
CtkBin — A container for one child @@ -106,6 +106,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-enum-types.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-enum-types.html --- clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-enum-types.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-enum-types.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -249,6 +249,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-main.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-main.html --- clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-main.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-main.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -68,14 +68,12 @@

argc :

- the number of arguments in argv. [inout] - + the number of arguments in argv. inout.

argv :

a pointer to an array of - arguments. [array length=argc][inout length=argc][allow-none length=argc] - + arguments. array length=argc. inout length=argc. allow-none length=argc. @@ -94,14 +92,12 @@

argc :

- the number of arguments in argv. [inout] - + the number of arguments in argv. inout.

argv :

a pointer to an array of - arguments. [array length=argc][inout length=argc][allow-none length=argc] - + arguments. array length=argc. inout length=argc. allow-none length=argc. @@ -185,6 +181,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-private.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-private.html --- clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-private.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-private.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -38,6 +38,11 @@

Synopsis

#define             CTK_PARAM_READWRITE
+#define             GL_CLAMP
+#define             GL_BLEND_SRC
+#define             GL_BLEND_DST
+#define             GL_RGBA8
+#define             GL_RGB8
 enum                CtkCapability;
 enum                CtkOpenGLVersion;
 enum                CtkGLSLVersion;
@@ -62,6 +67,46 @@
+
+

GL_CLAMP

+
#define GL_CLAMP GL_CLAMP_TO_EDGE
+
+

+

+
+
+
+

GL_BLEND_SRC

+
#define GL_BLEND_SRC GL_BLEND_SRC_RGB
+
+

+

+
+
+
+

GL_BLEND_DST

+
#define GL_BLEND_DST GL_BLEND_DST_RGB
+
+

+

+
+
+
+

GL_RGBA8

+
#define GL_RGBA8 GL_RGBA
+
+

+

+
+
+
+

GL_RGB8

+
#define GL_RGB8 GL_RGB
+
+

+

+
+

enum CtkCapability

typedef enum
@@ -267,6 +312,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-render-target.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-render-target.html --- clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-render-target.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-render-target.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -370,13 +370,11 @@

width :

- a location to store the width. [out] - + a location to store the width. out.

height :

- a location to store the height. [out] - + a location to store the height. out. @@ -431,6 +429,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-types.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-types.html --- clutk-0.3.32/doc/reference/clutk/html/clutk-ctk-types.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk-ctk-types.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -119,6 +119,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/clutk.devhelp clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk.devhelp --- clutk-0.3.32/doc/reference/clutk/html/clutk.devhelp 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk.devhelp 2010-06-19 10:33:19.000000000 +0100 @@ -384,6 +384,11 @@ + + + + + diff -Nru clutk-0.3.32/doc/reference/clutk/html/clutk.devhelp2 clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk.devhelp2 --- clutk-0.3.32/doc/reference/clutk/html/clutk.devhelp2 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/clutk.devhelp2 2010-06-19 10:33:19.000000000 +0100 @@ -384,6 +384,11 @@ + + + + + diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkActor.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkActor.html --- clutk-0.3.32/doc/reference/clutk/html/CtkActor.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkActor.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -56,15 +56,15 @@ CtkPadding *padding); void ctk_actor_get_padding (CtkActor *actor, CtkPadding *padding); -GtkTextDirection ctk_actor_get_default_direction (void); -void ctk_actor_set_default_direction (GtkTextDirection dir); +GtkTextDirection ctk_actor_get_default_direction (void); +void ctk_actor_set_default_direction (GtkTextDirection dir); void ctk_actor_set_background (CtkActor *actor, - ClutterActor *bg); -ClutterActor * ctk_actor_get_background (CtkActor *actor); + ClutterActor *bg); +ClutterActor * ctk_actor_get_background (CtkActor *actor); void ctk_actor_set_background_for_state (CtkActor *actor, CtkActorState state, - ClutterActor *bg); -ClutterActor * ctk_actor_get_background_for_state (CtkActor *actor, + ClutterActor *bg); +ClutterActor * ctk_actor_get_background_for_state (CtkActor *actor, CtkActorState state); void ctk_actor_set_tooltip_text (CtkActor *actor, const gchar *self); @@ -82,10 +82,10 @@ gboolean damaged); gboolean ctk_actor_get_damaged (CtkActor *actor); void ctk_actor_get_stored_allocation (CtkActor *actor, - ClutterActorBox *box); + ClutterActorBox *box); void ctk_actor_recurse_get_stored_allocation_box (CtkActor *actor, - ClutterActorBox *box); + ClutterActorBox *box);
@@ -93,7 +93,7 @@ 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkBin
                      +----CtkBox
@@ -109,7 +109,7 @@
 
Implemented Interfaces

 

 CtkActor implements
- ClutterScriptable and  CtkFocusable.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface and  CtkFocusable.

Properties

@@ -140,7 +140,7 @@

Description

-A CtkActor is the base widget class for building Ctk style objects, it contains additional logic on top of ClutterActor for userinterface building +A CtkActor is the base widget class for building Ctk style objects, it contains additional logic on top of ClutterActor for userinterface building

@@ -278,7 +278,7 @@

ctk_actor_get_default_direction ()

-
GtkTextDirection    ctk_actor_get_default_direction     (void);
+
GtkTextDirection    ctk_actor_get_default_direction     (void);

Returns the default direction for all CtkActor widgets

@@ -286,7 +286,7 @@

Returns :

- A GtkTextDirection object + A GtkTextDirection object
@@ -294,7 +294,7 @@

ctk_actor_set_default_direction ()

-
void                ctk_actor_set_default_direction     (GtkTextDirection dir);
+
void                ctk_actor_set_default_direction     (GtkTextDirection dir);

Sets the default direction for all CtkActor objects

@@ -302,7 +302,7 @@

dir :

-A GtkTextDirection object +A GtkTextDirection object
@@ -311,7 +311,7 @@

ctk_actor_set_background ()

void                ctk_actor_set_background            (CtkActor *actor,
-                                                         ClutterActor *bg);
+ ClutterActor *bg);

Sets the background for actor to bg Will fade out old background first if one exists @@ -335,7 +335,7 @@

ctk_actor_get_background ()

-
ClutterActor *      ctk_actor_get_background            (CtkActor *actor);
+
ClutterActor *      ctk_actor_get_background            (CtkActor *actor);

Gets the current background for actor as previously set by ctk_actor_set_background()

@@ -360,7 +360,7 @@

ctk_actor_set_background_for_state ()

void                ctk_actor_set_background_for_state  (CtkActor *actor,
                                                          CtkActorState state,
-                                                         ClutterActor *bg);
+ ClutterActor *bg);

Sets the background of actor for the given state !FIXME! - needs fleshing out more @@ -380,7 +380,7 @@

bg :

-A ClutterActor +A ClutterActor @@ -389,7 +389,7 @@

ctk_actor_get_background_for_state ()

-
ClutterActor *      ctk_actor_get_background_for_state  (CtkActor *actor,
+
ClutterActor *      ctk_actor_get_background_for_state  (CtkActor *actor,
                                                          CtkActorState state);

 

 Gets the current background for actor in the given state previously set by ctk_actor_set_background_for_state()
@@ -645,7 +645,7 @@
 

 
ctk_actor_get_stored_allocation ()

 
void                ctk_actor_get_stored_allocation     (CtkActor *actor,
-                                                         ClutterActorBox *box);

+                                                         ClutterActorBox *box);
@@ -656,8 +656,7 @@ - +

box :

 A ClutterAllocationBox. [out] - A ClutterAllocationBox. out.
@@ -667,7 +666,7 @@

ctk_actor_recurse_get_stored_allocation_box ()

void                ctk_actor_recurse_get_stored_allocation_box
                                                         (CtkActor *actor,
-                                                         ClutterActorBox *box);
+ ClutterActorBox *box);
@@ -678,8 +677,7 @@ - +

box :

 A ClutterAllocationBox. [out] - A ClutterAllocationBox. out.
@@ -732,7 +730,7 @@

The "child-focus-changed" signal

void                user_function                      (CtkActor        *ctkactor,
-                                                        ClutterActorBox *arg1,
+                                                        ClutterActorBox *arg1,
                                                         gpointer         user_data)      : Run Last

@@ -760,7 +758,7 @@

The "drag-begin" signal

void                user_function                      (CtkActor       *ctkactor,
-                                                        GdkDragContext *arg1,
+                                                        GdkDragContext *arg1,
                                                         gpointer        user_data)      : Run Last

@@ -788,7 +786,7 @@

The "drag-data-delete" signal

void                user_function                      (CtkActor       *ctkactor,
-                                                        GdkDragContext *arg1,
+                                                        GdkDragContext *arg1,
                                                         gpointer        user_data)      : Run Last

@@ -816,8 +814,8 @@

The "drag-data-get" signal

void                user_function                      (CtkActor         *ctkactor,
-                                                        GdkDragContext   *arg1,
-                                                        GtkSelectionData *arg2,
+                                                        GdkDragContext   *arg1,
+                                                        GtkSelectionData *arg2,
                                                         guint             arg3,
                                                         guint             arg4,
                                                         gpointer          user_data)      : Run Last
@@ -862,10 +860,10 @@

The "drag-data-received" signal

void                user_function                      (CtkActor         *ctkactor,
-                                                        GdkDragContext   *arg1,
+                                                        GdkDragContext   *arg1,
                                                         gint              arg2,
                                                         gint              arg3,
-                                                        GtkSelectionData *arg4,
+                                                        GtkSelectionData *arg4,
                                                         guint             arg5,
                                                         guint             arg6,
                                                         gpointer          user_data)      : Run Last
@@ -920,7 +918,7 @@

The "drag-drop" signal

gboolean            user_function                      (CtkActor       *ctkactor,
-                                                        GdkDragContext *arg1,
+                                                        GdkDragContext *arg1,
                                                         gint            arg2,
                                                         gint            arg3,
                                                         guint           arg4,
@@ -971,7 +969,7 @@
 

 
The "drag-end" signal

 
void                user_function                      (CtkActor       *ctkactor,
-                                                        GdkDragContext *arg1,
+                                                        GdkDragContext *arg1,
                                                         gpointer        user_data)      : Run Last

 

 

@@ -999,8 +997,8 @@
 

 
The "drag-failed" signal

 
gboolean            user_function                      (CtkActor       *ctkactor,
-                                                        GdkDragContext *arg1,
-                                                        GtkDragResult   arg2,
+                                                        GdkDragContext *arg1,
+                                                        GtkDragResult   arg2,
                                                         gpointer        user_data)      : Run Last

 

 

@@ -1038,7 +1036,7 @@
 

 
The "drag-leave" signal

 
void                user_function                      (CtkActor       *ctkactor,
-                                                        GdkDragContext *arg1,
+                                                        GdkDragContext *arg1,
                                                         guint           arg2,
                                                         gpointer        user_data)      : Run Last

 

@@ -1072,7 +1070,7 @@
 

 
The "drag-motion" signal

 
gboolean            user_function                      (CtkActor       *ctkactor,
-                                                        GdkDragContext *arg1,
+                                                        GdkDragContext *arg1,
                                                         gint            arg2,
                                                         gint            arg3,
                                                         guint           arg4,
@@ -1123,6 +1121,6 @@
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.14

 
 
\ No newline at end of file
diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkBin.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkBin.html
--- clutk-0.3.32/doc/reference/clutk/html/CtkBin.html	2010-06-10 17:22:32.000000000 +0100
+++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkBin.html	2010-06-19 10:33:20.000000000 +0100
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -47,7 +47,7 @@
                     CtkBin;
                     CtkBinClass;
                     CtkBinPrivate;
-ClutterActor *      ctk_bin_get_child                   (CtkBin *bin);
+ClutterActor *      ctk_bin_get_child                   (CtkBin *bin);
@@ -55,7 +55,7 @@ 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkBin
                            +----CtkButton
@@ -68,7 +68,7 @@
 
Implemented Interfaces

 

 CtkBin implements
- ClutterScriptable,  CtkFocusable and  ClutterContainer.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface,  CtkFocusable and  ClutterContainer.

Description

@@ -106,7 +106,7 @@

ctk_bin_get_child ()

-
ClutterActor *      ctk_bin_get_child                   (CtkBin *bin);
+
ClutterActor *      ctk_bin_get_child                   (CtkBin *bin);

Gets the single child of bin - if there is no child set this will return NULL

@@ -120,7 +120,7 @@

Returns :

- a ClutterActor or NULL + a ClutterActor or NULL @@ -130,6 +130,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14
\ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkBox.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkBox.html --- clutk-0.3.32/doc/reference/clutk/html/CtkBox.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkBox.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -48,7 +48,7 @@ CtkBoxPrivate; CtkBoxChild; void ctk_box_pack (CtkBox *box, - ClutterActor *child, + ClutterActor *child, gboolean expand, gboolean fill); void ctk_box_set_homogeneous (CtkBox *box, @@ -69,7 +69,7 @@ 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkBox
                            +----CtkHBox
@@ -80,7 +80,7 @@
 
Implemented Interfaces

 

 CtkBox implements
- ClutterScriptable,  CtkFocusable and  ClutterContainer.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface,  CtkFocusable and  ClutterContainer.

Properties

@@ -135,7 +135,7 @@

ctk_box_pack ()

void                ctk_box_pack                        (CtkBox *box,
-                                                         ClutterActor *child,
+                                                         ClutterActor *child,
                                                          gboolean expand,
                                                          gboolean fill);

@@ -366,6 +366,6 @@

- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14
\ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkButton.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkButton.html --- clutk-0.3.32/doc/reference/clutk/html/CtkButton.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkButton.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -49,7 +49,7 @@ 
                    CtkButton;
                     CtkButtonClass;
                     CtkButtonPrivate;
-ClutterActor *      ctk_button_new                      (CtkOrientation orientation);
+ClutterActor *      ctk_button_new                      (CtkOrientation orientation);
 void                ctk_button_set_label                (CtkButton *button,
                                                          const gchar *label);
 const gchar *       ctk_button_get_label                (CtkButton *button);
@@ -69,7 +69,7 @@
 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkBin
                            +----CtkButton
@@ -79,7 +79,7 @@
 
Implemented Interfaces

 

 CtkButton implements
- ClutterScriptable,  CtkFocusable and  ClutterContainer.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface,  CtkFocusable and  ClutterContainer.

Properties

@@ -136,7 +136,7 @@

ctk_button_new ()

-
ClutterActor *      ctk_button_new                      (CtkOrientation orientation);
+
ClutterActor *      ctk_button_new                      (CtkOrientation orientation);

Creates a new CtkButton object

@@ -428,6 +428,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14
\ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkEffectBlur.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffectBlur.html --- clutk-0.3.32/doc/reference/clutk/html/CtkEffectBlur.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffectBlur.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -201,6 +201,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14
\ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkEffectContext.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffectContext.html --- clutk-0.3.32/doc/reference/clutk/html/CtkEffectContext.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffectContext.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -49,16 +49,16 @@ CtkEffectContextClass; CtkEffectContextPrivate; CtkEffectContext * ctk_effect_context_get_default_for_stage - (ClutterStage *stage); + (ClutterStage *stage); CtkEffectContext * ctk_effect_context_get_default_for_actor - (ClutterActor *actor); + (ClutterActor *actor); CtkRenderTarget * ctk_effect_context_grab_render_target_for_size (CtkEffectContext *self, guint width, guint height); CtkRenderTarget * ctk_effect_context_grab_render_target_for_actor (CtkEffectContext *self, - ClutterActor *actor); + ClutterActor *actor); CtkRenderTarget * ctk_effect_context_grab_render_target (CtkEffectContext *self); void ctk_effect_context_release_render_target @@ -125,7 +125,7 @@

ctk_effect_context_get_default_for_stage ()

CtkEffectContext *  ctk_effect_context_get_default_for_stage
-                                                        (ClutterStage *stage);
+ (ClutterStage *stage);

Creates a new CtkEffectContext that will manage the stage or will return the default CtkEffectContext for the stage if one already exists. @@ -139,7 +139,7 @@

stage :

-A ClutterStage +A ClutterStage @@ -154,7 +154,7 @@

ctk_effect_context_get_default_for_actor ()

CtkEffectContext *  ctk_effect_context_get_default_for_actor
-                                                        (ClutterActor *actor);
+ (ClutterActor *actor);

Creates a new CtkEffectContext that will manage the stage that the actor is bound to, or will return the default CtkEffectContext for that stage @@ -169,12 +169,12 @@

actor :

-A ClutterActor +A ClutterActor

Returns :

- The CtkEffectContext that manages the actor's ClutterStage. + The CtkEffectContext that manages the actor's ClutterStage. @@ -220,7 +220,7 @@

ctk_effect_context_grab_render_target_for_actor ()

CtkRenderTarget *   ctk_effect_context_grab_render_target_for_actor
                                                         (CtkEffectContext *self,
-                                                         ClutterActor *actor);
+ ClutterActor *actor);

This is a convenience function to get a CtkRenderTarget from self's pool that matches the width and height of actor. You should only use this call @@ -236,7 +236,7 @@

actor :

-a ClutterActor +a ClutterActor @@ -396,13 +396,13 @@

The "stage" property

  "stage"                    gpointer              : Read / Write / Construct Only

-The ClutterStage that this CtkEffectContext handles the effects for. +The ClutterStage that this CtkEffectContext handles the effects for.

- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14
\ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkEffectDropShadow.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffectDropShadow.html --- clutk-0.3.32/doc/reference/clutk/html/CtkEffectDropShadow.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffectDropShadow.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -403,6 +403,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14
\ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkEffectGlow.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffectGlow.html --- clutk-0.3.32/doc/reference/clutk/html/CtkEffectGlow.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffectGlow.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -55,12 +55,12 @@ gfloat factor); gfloat ctk_effect_glow_get_factor (CtkEffectGlow *glow); void ctk_effect_glow_set_color (CtkEffectGlow *glow, - ClutterColor *c); + ClutterColor *c); void ctk_effect_glow_get_color (CtkEffectGlow *glow, - ClutterColor *color); + ClutterColor *color); void ctk_effect_glow_set_background_texture (CtkEffectGlow *self, - GdkPixbuf *pixbuf); + GdkPixbuf *pixbuf);
@@ -75,7 +75,7 @@

Properties

-  "color"                    ClutterColor*         : Read / Write
+  "color"                    ClutterColor*         : Read / Write
   "factor"                   gfloat                : Read / Write
@@ -199,7 +199,7 @@

ctk_effect_glow_set_color ()

void                ctk_effect_glow_set_color           (CtkEffectGlow *glow,
-                                                         ClutterColor *c);
+ ClutterColor *c);

glow: A pointer to a CtkEffectGlow object color: The glow color to set @@ -224,7 +224,7 @@

ctk_effect_glow_get_color ()

void                ctk_effect_glow_get_color           (CtkEffectGlow *glow,
-                                                         ClutterColor *color);
+ ClutterColor *color);

glow: A pointer to a CtkEffectGlow object color: Returns the glow color @@ -250,7 +250,7 @@

ctk_effect_glow_set_background_texture ()

void                ctk_effect_glow_set_background_texture
                                                         (CtkEffectGlow *self,
-                                                         GdkPixbuf *pixbuf);
+ GdkPixbuf *pixbuf);

glow: A pointer to a CtkEffectGlow object pixbuf: Pixbux image containing the background texture @@ -280,7 +280,7 @@

Property Details

The "color" property

-
  "color"                    ClutterColor*         : Read / Write
+
  "color"                    ClutterColor*         : Read / Write

glow color.

@@ -295,6 +295,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14
\ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkEffect.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffect.html --- clutk-0.3.32/doc/reference/clutk/html/CtkEffect.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkEffect.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -53,14 +53,14 @@ CtkEffect; CtkEffectClass; CtkEffectPrivate; -void (*CtkEffectPaintFunc) (ClutterActor *actor); +void (*CtkEffectPaintFunc) (ClutterActor *actor); void ctk_effect_paint (CtkEffect *self, CtkEffectPaintFunc func, gboolean is_last_effect); void ctk_effect_set_actor (CtkEffect *self, - ClutterActor *actor); -ClutterActor * ctk_effect_get_actor (CtkEffect *self); -ClutterAnimation * ctk_effect_animate (CtkEffect *self, + ClutterActor *actor); +ClutterActor * ctk_effect_get_actor (CtkEffect *self); +ClutterAnimation * ctk_effect_animate (CtkEffect *self, gulong mode, guint duration, const gchar *first_property_name, @@ -78,7 +78,7 @@ (CtkEffect *self, gboolean dirty); gboolean ctk_effect_is_effect_cache_dirty (CtkEffect *self); -ClutterAnimation * ctk_effect_get_animation (CtkEffect *self); +ClutterAnimation * ctk_effect_get_animation (CtkEffect *self);
@@ -210,7 +210,7 @@

CtkEffectPaintFunc ()

-
void                (*CtkEffectPaintFunc)               (ClutterActor *actor);
+
void                (*CtkEffectPaintFunc)               (ClutterActor *actor);

@@ -231,7 +231,7 @@

Will cause the self to paint itself. Should only be called during a paint cycle. func will be used to paint the actor that the effect is -attached to directly, without going through clutter_actor_paint, which +attached to directly, without going through clutter_actor_paint, which does some additional work which conflicts with the effects.

@@ -259,7 +259,7 @@

ctk_effect_set_actor ()

void                ctk_effect_set_actor                (CtkEffect *self,
-                                                         ClutterActor *actor);
+ ClutterActor *actor);

This is a conveniece function for CtkActor. If you want to bind an effect to an actor, you should call ctk_actor_add_effect instead. @@ -274,8 +274,7 @@

- +

actor :

 a CtkActor, or NULL. [allow-none] - a CtkActor, or NULL. allow-none.
@@ -283,7 +282,7 @@

ctk_effect_get_actor ()

-
ClutterActor *      ctk_effect_get_actor                (CtkEffect *self);
+
ClutterActor *      ctk_effect_get_actor                (CtkEffect *self);
@@ -294,7 +293,7 @@ - @@ -303,7 +302,7 @@

ctk_effect_animate ()

-
ClutterAnimation *  ctk_effect_animate                  (CtkEffect *self,
+
ClutterAnimation *  ctk_effect_animate                  (CtkEffect *self,
                                                          gulong mode,
                                                          guint duration,
                                                          const gchar *first_property_name,
@@ -311,7 +310,7 @@
 

 Animates the give list of properties of self between the current value for
 each property and a new final value. The animation has a definite duration
-and a speed given by the mode. See clutter_actor_animate for more details
+and a speed given by the mode. See clutter_actor_animate for more details
 on signal connection.

Returns :

 the ClutterActor that this effect is bound to, or NULL + the ClutterActor that this effect is bound to, or NULL
@@ -344,10 +343,9 @@ - +g_object_unref(). transfer none.

Returns :

 a ClutterAnimation object. The object is + a ClutterAnimation object. The object is owned by the CtkEffect and should not be unrefferenced with -g_object_unref(). [transfer none] -
@@ -534,7 +532,7 @@

ctk_effect_get_animation ()

-
ClutterAnimation *  ctk_effect_get_animation            (CtkEffect *self);
+
ClutterAnimation *  ctk_effect_get_animation            (CtkEffect *self);
@@ -545,7 +543,7 @@ - @@ -588,6 +586,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkFocusable.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkFocusable.html --- clutk-0.3.32/doc/reference/clutk/html/CtkFocusable.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkFocusable.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -115,6 +115,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkHBox.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkHBox.html --- clutk-0.3.32/doc/reference/clutk/html/CtkHBox.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkHBox.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -43,7 +43,7 @@

Synopsis

                    CtkHBox;
                     CtkHBoxClass;
-ClutterActor *      ctk_hbox_new                        (guint spacing);
+ClutterActor *      ctk_hbox_new                        (guint spacing);
@@ -51,7 +51,7 @@ 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkBox
                            +----CtkHBox
@@ -61,7 +61,7 @@
 
Implemented Interfaces

 

 CtkHBox implements
- ClutterScriptable,  CtkFocusable and  ClutterContainer.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface,  CtkFocusable and  ClutterContainer.

Description

@@ -90,7 +90,7 @@

ctk_hbox_new ()

-
ClutterActor *      ctk_hbox_new                        (guint spacing);
+
ClutterActor *      ctk_hbox_new                        (guint spacing);

creates a new CtkHBox

@@ -118,6 +118,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14
\ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkIconView.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkIconView.html --- clutk-0.3.32/doc/reference/clutk/html/CtkIconView.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkIconView.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -49,7 +49,7 @@ CtkIconView; CtkIconViewClass; CtkIconViewPrivate; -ClutterActor * ctk_icon_view_new (void); +ClutterActor * ctk_icon_view_new (void); voidctk_icon_view_set_spacing (CtkIconView *icon_view, gint spacing); gintctk_icon_view_get_spacing (CtkIconView *icon_view); @@ -60,7 +60,7 @@ 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkIconView
@@ -69,7 +69,7 @@

Implemented Interfaces

CtkIconView implements - ClutterScriptable, CtkFocusable and ClutterContainer.

+ ClutterScriptable, ClutterAnimatable, AtkImplementorIface, CtkFocusable and ClutterContainer.

Properties

@@ -111,7 +111,7 @@

ctk_icon_view_new ()

-
ClutterActor *      ctk_icon_view_new                   (void);
+
ClutterActor *      ctk_icon_view_new                   (void);

Returns :

 a ClutterAnimation for the effect, if ctk_effect_animate has + a ClutterAnimation for the effect, if ctk_effect_animate has been called on self.
@@ -184,6 +184,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkImage.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkImage.html --- clutk-0.3.32/doc/reference/clutk/html/CtkImage.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkImage.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -50,23 +50,23 @@ CtkImageClass; CtkImagePrivate; enum CtkImageType; -ClutterActor * ctk_image_new (guint size); -ClutterActor * ctk_image_new_from_pixbuf (guint size, - GdkPixbuf *pixbuf); -ClutterActor * ctk_image_new_from_stock (guint size, +ClutterActor * ctk_image_new (guint size); +ClutterActor * ctk_image_new_from_pixbuf (guint size, + GdkPixbuf *pixbuf); +ClutterActor * ctk_image_new_from_stock (guint size, const gchar *stock_id); -ClutterActor * ctk_image_new_from_icon_name (guint size, +ClutterActor * ctk_image_new_from_icon_name (guint size, const gchar *icon_name); -ClutterActor * ctk_image_new_from_gicon (guint size, +ClutterActor * ctk_image_new_from_gicon (guint size, GIcon *icon); -ClutterActor * ctk_image_new_from_filename (guint size, +ClutterActor * ctk_image_new_from_filename (guint size, const gchar *filename); CtkImageTypectk_image_get_image_storage_type (CtkImage *image); voidctk_image_set_size (CtkImage *image, guint size); guintctk_image_get_size (CtkImage *image); voidctk_image_set_from_pixbuf (CtkImage *image, - GdkPixbuf *pixbuf); + GdkPixbuf *pixbuf); voidctk_image_set_from_stock (CtkImage *image, const gchar *stock_id); voidctk_image_set_from_icon_name (CtkImage *image, @@ -75,7 +75,7 @@ GIcon *icon); voidctk_image_set_from_filename (CtkImage *image, const gchar *filename); -GdkPixbuf * ctk_image_get_pixbuf (CtkImage *image); +GdkPixbuf * ctk_image_get_pixbuf (CtkImage *image); const gchar * ctk_image_get_stock (CtkImage *image); const gchar * ctk_image_get_icon_name (CtkImage *image); GIcon * ctk_image_get_gicon (CtkImage *image); @@ -87,7 +87,7 @@ 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkImage
@@ -96,7 +96,7 @@

Implemented Interfaces

CtkImage implements - ClutterScriptable and CtkFocusable.

+ ClutterScriptable, ClutterAnimatable, AtkImplementorIface and CtkFocusable.

Properties

@@ -104,7 +104,7 @@ "filename" gchar* : Read / Write "gicon" GIcon* : Read / Write "icon-name" gchar* : Read / Write - "pixbuf" GdkPixbuf* : Read / Write + "pixbuf" GdkPixbuf* : Read / Write "size" gint : Read / Write "stock-id" gchar* : Read / Write @@ -162,7 +162,7 @@

ctk_image_new ()

-
ClutterActor *      ctk_image_new                       (guint size);
+
ClutterActor *      ctk_image_new                       (guint size);

Creates a new Ctk of the given size

@@ -185,8 +185,8 @@

ctk_image_new_from_pixbuf ()

-
ClutterActor *      ctk_image_new_from_pixbuf           (guint size,
-                                                         GdkPixbuf *pixbuf);
+
ClutterActor *      ctk_image_new_from_pixbuf           (guint size,
+                                                         GdkPixbuf *pixbuf);

Creates a new CtkImage object based on the data in pixbuf

@@ -200,7 +200,7 @@
- @@ -214,10 +214,10 @@

ctk_image_new_from_stock ()

-
ClutterActor *      ctk_image_new_from_stock            (guint size,
+
ClutterActor *      ctk_image_new_from_stock            (guint size,
                                                          const gchar *stock_id);

 

-Creates a new CtkImage based on the stock_id provided, see GtkStockItem
+Creates a new CtkImage based on the stock_id provided, see GtkStockItem

pixbuf :

a GdkPixbuf object +a GdkPixbuf object
@@ -243,7 +243,7 @@

ctk_image_new_from_icon_name ()

-
ClutterActor *      ctk_image_new_from_icon_name        (guint size,
+
ClutterActor *      ctk_image_new_from_icon_name        (guint size,
                                                          const gchar *icon_name);

 

 Uses a "named icon" to create a new CtkImage object
@@ -263,7 +263,7 @@
- @@ -272,7 +272,7 @@

ctk_image_new_from_gicon ()

-
ClutterActor *      ctk_image_new_from_gicon            (guint size,
+
ClutterActor *      ctk_image_new_from_gicon            (guint size,
                                                          GIcon *icon);

 

 Creates a new CtkImage object based on the data in the provided GIcon icon
@@ -301,7 +301,7 @@
 

 

 
ctk_image_new_from_filename ()

-
ClutterActor *      ctk_image_new_from_filename         (guint size,
+
ClutterActor *      ctk_image_new_from_filename         (guint size,
                                                          const gchar *filename);

 

 Creates a new CtkImage from the image containined at filename
@@ -401,7 +401,7 @@
 

 
ctk_image_set_from_pixbuf ()

 
void                ctk_image_set_from_pixbuf           (CtkImage *image,
-                                                         GdkPixbuf *pixbuf);

+                                                         GdkPixbuf *pixbuf);

 

 sets image to use pixbuf for its image data
 see ctk_image_new_from_pixbuf()
@@ -416,7 +416,7 @@
- @@ -524,7 +524,7 @@

ctk_image_get_pixbuf ()

-
GdkPixbuf *         ctk_image_get_pixbuf                (CtkImage *image);
+
GdkPixbuf *         ctk_image_get_pixbuf                (CtkImage *image);

Returns :

 a new ClutterActor + a new ClutterActor

pixbuf :

A GdkPixbuf object +A GdkPixbuf object
@@ -656,7 +656,7 @@

The "pixbuf" property

-
  "pixbuf"                   GdkPixbuf*            : Read / Write
+
  "pixbuf"                   GdkPixbuf*            : Read / Write

Pixbuf to display.

@@ -678,6 +678,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkLayerActor.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkLayerActor.html --- clutk-0.3.32/doc/reference/clutk/html/CtkLayerActor.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkLayerActor.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@ 
                    CtkLayerActor;
                     CtkLayerActorClass;
                     CtkLayerActorPrivate;
-ClutterActor *      ctk_layer_actor_new                 (guint width,
+ClutterActor *      ctk_layer_actor_new                 (guint width,
                                                          guint height);
 guint               ctk_layer_actor_get_width           (CtkLayerActor *self);
 void                ctk_layer_actor_set_width           (CtkLayerActor *self,
@@ -69,7 +69,7 @@
 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkLayerActor
 

@@ -78,7 +78,7 @@
 
Implemented Interfaces

 

 CtkLayerActor implements
- ClutterScriptable and  CtkFocusable.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface and  CtkFocusable.

 
 

 
Properties

@@ -127,7 +127,7 @@
 

 

 
ctk_layer_actor_new ()

-
ClutterActor *      ctk_layer_actor_new                 (guint width,
+
ClutterActor *      ctk_layer_actor_new                 (guint width,
                                                          guint height);

 

 Creates a new CtkLayerActor, which can hold multiple layers (image/mask) to
@@ -148,7 +148,7 @@
- @@ -421,6 +421,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkLayer.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkLayer.html --- clutk-0.3.32/doc/reference/clutk/html/CtkLayer.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkLayer.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -56,28 +56,28 @@ voidctk_layer_set_height (CtkLayer *self, guint height); voidctk_layer_get_color (CtkLayer *self, - ClutterColor *color); + ClutterColor *color); voidctk_layer_set_color (CtkLayer *self, - ClutterColor *color); + ClutterColor *color); guint8ctk_layer_get_opacity (CtkLayer *self); voidctk_layer_set_opacity (CtkLayer *self, guint8 opacity); voidctk_layer_set_image_pixbuf (CtkLayer *self, - GdkPixbuf *pixbuf); -GdkPixbuf * ctk_layer_get_image_pixbuf (CtkLayer *self); + GdkPixbuf *pixbuf); +GdkPixbuf * ctk_layer_get_image_pixbuf (CtkLayer *self); voidctk_layer_set_mask_pixbuf (CtkLayer *self, - GdkPixbuf *pixbuf); -GdkPixbuf * ctk_layer_get_mask_pixbuf (CtkLayer *self); + GdkPixbuf *pixbuf); +GdkPixbuf * ctk_layer_get_mask_pixbuf (CtkLayer *self); voidctk_layer_set_image_from_file (CtkLayer *self, gchar *filename); voidctk_layer_set_image_from_pixbuf (CtkLayer *self, - GdkPixbuf *pixbuf); + GdkPixbuf *pixbuf); voidctk_layer_set_image_from_surface (CtkLayer *self, cairo_surface_t *surface); voidctk_layer_set_mask_from_file (CtkLayer *self, gchar *filename); voidctk_layer_set_mask_from_pixbuf (CtkLayer *self, - GdkPixbuf *pixbuf); + GdkPixbuf *pixbuf); voidctk_layer_set_mask_from_surface (CtkLayer *self, cairo_surface_t *surface); voidctk_layer_set_image_from_id (CtkLayer *self, @@ -108,14 +108,14 @@

Properties

-  "color"                    ClutterColor*         : Read / Write
+  "color"                    ClutterColor*         : Read / Write
   "enabled"                  gboolean              : Read / Write
   "height"                   guint                 : Read / Write
   "image-id"                 guint                 : Read
-  "image-pixbuf"             GdkPixbuf*            : Read / Write
+  "image-pixbuf"             GdkPixbuf*            : Read / Write
   "image-repeat-mode"        guint                 : Read / Write
   "mask-id"                  guint                 : Read
-  "mask-pixbuf"              GdkPixbuf*            : Read / Write
+  "mask-pixbuf"              GdkPixbuf*            : Read / Write
   "mask-repeat-mode"         guint                 : Read / Write
   "opacity"                  guint                 : Read / Write
   "valid"                    gboolean              : Read
@@ -313,9 +313,9 @@
 

 
ctk_layer_get_color ()

 
void                ctk_layer_get_color                 (CtkLayer *self,
-                                                         ClutterColor *color);

+                                                         ClutterColor *color);

-Copy the color of self to the ClutterColor pointed to by color. If you +Copy the color of self to the ClutterColor pointed to by color. If you pass a NULL-pointer for color nothing happens.

@@ -331,7 +331,7 @@

- @@ -341,7 +341,7 @@

ctk_layer_set_color ()

void                ctk_layer_set_color                 (CtkLayer *self,
-                                                         ClutterColor *color);
+ ClutterColor *color);

Set the red-, green-, blue- and alpha-component of self. If color or self is a NULL-pointer nothing happens. @@ -362,7 +362,7 @@

- @@ -424,7 +424,7 @@

ctk_layer_set_image_pixbuf ()

void                ctk_layer_set_image_pixbuf          (CtkLayer *self,
-                                                         GdkPixbuf *pixbuf);
+ GdkPixbuf *pixbuf);

Set the image's pixbuf of self directly. This will reference pixbuf.

@@ -438,7 +438,7 @@
- @@ -447,7 +447,7 @@

ctk_layer_get_image_pixbuf ()

-
GdkPixbuf *         ctk_layer_get_image_pixbuf          (CtkLayer *self);
+
GdkPixbuf *         ctk_layer_get_image_pixbuf          (CtkLayer *self);

Get the pixbuf of self's image, if one is set.

@@ -461,7 +461,7 @@
- @@ -471,7 +471,7 @@

ctk_layer_set_mask_pixbuf ()

void                ctk_layer_set_mask_pixbuf           (CtkLayer *self,
-                                                         GdkPixbuf *pixbuf);
+ GdkPixbuf *pixbuf);

Set the mask's pixbuf of self directly. This will reference pixbuf.

@@ -485,7 +485,7 @@
- @@ -494,7 +494,7 @@

ctk_layer_get_mask_pixbuf ()

-
GdkPixbuf *         ctk_layer_get_mask_pixbuf           (CtkLayer *self);
+
GdkPixbuf *         ctk_layer_get_mask_pixbuf           (CtkLayer *self);

Get the pixbuf of self's mask, if one is set.

@@ -544,7 +544,7 @@

ctk_layer_set_image_from_pixbuf ()

void                ctk_layer_set_image_from_pixbuf     (CtkLayer *self,
-                                                         GdkPixbuf *pixbuf);
+ GdkPixbuf *pixbuf);

Set the image of self by grabbing the pixel-data from pixbuf.

@@ -562,7 +562,7 @@
- @@ -627,9 +627,9 @@

ctk_layer_set_mask_from_pixbuf ()

void                ctk_layer_set_mask_from_pixbuf      (CtkLayer *self,
-                                                         GdkPixbuf *pixbuf);
+ GdkPixbuf *pixbuf);

-Sets self's mask from a GdkPixbuf pixbuf. Any pre-existing mask will be +Sets self's mask from a GdkPixbuf pixbuf. Any pre-existing mask will be removed by this call. Remember that the passed in surface needs to be of the same width and height as self. If surface is not an image-surface this call has no effect. @@ -648,7 +648,7 @@

- @@ -962,7 +962,7 @@

Property Details

The "color" property

-
  "color"                    ClutterColor*         : Read / Write
+
  "color"                    ClutterColor*         : Read / Write

Solid RGBA-color of layer.

@@ -989,7 +989,7 @@

The "image-pixbuf" property

-
  "image-pixbuf"             GdkPixbuf*            : Read / Write
+
  "image-pixbuf"             GdkPixbuf*            : Read / Write

GdkPixbuf of layer-image.

@@ -1010,7 +1010,7 @@

The "mask-pixbuf" property

-
  "mask-pixbuf"              GdkPixbuf*            : Read / Write
+
  "mask-pixbuf"              GdkPixbuf*            : Read / Write

GdkPixbuf of layer-mask.

@@ -1050,6 +1050,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkScrollView.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkScrollView.html --- clutk-0.3.32/doc/reference/clutk/html/CtkScrollView.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkScrollView.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -47,21 +47,21 @@ CtkScrollViewClass; CtkScrollViewPrivate; enum CtkScrollbarType; -ClutterActor * ctk_scroll_view_new (void); +ClutterActor * ctk_scroll_view_new (void); CtkScrollbarTypectk_scroll_view_get_bar_type (CtkScrollView *view); voidctk_scroll_view_set_bar_type (CtkScrollView *view, CtkScrollbarType type); gbooleanctk_scroll_view_scroll (CtkScrollView *view, - ClutterScrollEvent *event); + ClutterScrollEvent *event); voidctk_scroll_view_set_value (CtkScrollView *view, gfloat value); gfloatctk_scroll_view_get_value (CtkScrollView *view); voidctk_scroll_view_set_scroll_bar (CtkScrollView *view, - ClutterActor *trough, - ClutterActor *slider); + ClutterActor *trough, + ClutterActor *slider); voidctk_scroll_view_get_scroll_bar (CtkScrollView *view, - ClutterActor **trough, - ClutterActor **slider); + ClutterActor **trough, + ClutterActor **slider); gbooleanctk_scroll_view_can_scroll (CtkScrollView *view); @@ -70,7 +70,7 @@ 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkBin
                            +----CtkScrollView
@@ -80,7 +80,7 @@
 
Implemented Interfaces

 

 CtkScrollView implements
- ClutterScriptable,  CtkFocusable and  ClutterContainer.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface,  CtkFocusable and  ClutterContainer.

 
 

 
Properties

@@ -140,7 +140,7 @@
 

 

 
ctk_scroll_view_new ()

-
ClutterActor *      ctk_scroll_view_new                 (void);

+
ClutterActor *      ctk_scroll_view_new                 (void);

Returns :

 a ClutterActor or NULL in case of an error + a ClutterActor or NULL in case of an error

color :

a ClutterColor +a ClutterColor

color :

a ClutterColor +a ClutterColor

pixbuf :

a pointer to a GdkPixbuf +a pointer to a GdkPixbuf

Returns :

 a pointer to a GdkPixbuf + a pointer to a GdkPixbuf

pixbuf :

a pointer to a GdkPixbuf +a pointer to a GdkPixbuf

pixbuf :

a GdkPixbuf +a GdkPixbuf

pixbuf :

a GdkPixbuf +a GdkPixbuf
@@ -203,9 +203,9 @@

ctk_scroll_view_scroll ()

gboolean            ctk_scroll_view_scroll              (CtkScrollView *view,
-                                                         ClutterScrollEvent *event);
+ ClutterScrollEvent *event);

-Scrolls view in a given direction by some ammount, see ClutterScrollEvent +Scrolls view in a given direction by some ammount, see ClutterScrollEvent

@@ -217,7 +217,7 @@ - @@ -279,8 +279,8 @@

ctk_scroll_view_set_scroll_bar ()

void                ctk_scroll_view_set_scroll_bar      (CtkScrollView *view,
-                                                         ClutterActor *trough,
-                                                         ClutterActor *slider);
+ ClutterActor *trough, + ClutterActor *slider);

Sets view to use trough and slider as its actors for its scrollbar

@@ -294,12 +294,12 @@
- - @@ -309,10 +309,10 @@

ctk_scroll_view_get_scroll_bar ()

void                ctk_scroll_view_get_scroll_bar      (CtkScrollView *view,
-                                                         ClutterActor **trough,
-                                                         ClutterActor **slider);
+ ClutterActor **trough, + ClutterActor **slider);

-Retrives the current ClutterActor used in view for its trough and slider graphics +Retrives the current ClutterActor used in view for its trough and slider graphics

event :

a ClutterScrollEvent object +a ClutterScrollEvent object

trough :

a ClutterActor object +a ClutterActor object

slider :

a ClutterActor object +a ClutterActor object
@@ -324,12 +324,12 @@ - - @@ -379,6 +379,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkText.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkText.html --- clutk-0.3.32/doc/reference/clutk/html/CtkText.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkText.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -44,7 +44,7 @@ 
                    CtkText;
                     CtkTextClass;
                     CtkTextPrivate;
-ClutterActor *      ctk_text_new                        (const gchar *text);
+ClutterActor *      ctk_text_new                        (const gchar *text);
 void                ctk_text_set_alignment              (CtkText *self,
                                                          PangoAlignment alignment);
 PangoAlignment      ctk_text_get_alignment              (CtkText *self);
@@ -55,8 +55,8 @@
 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
-               +----ClutterText
+         +----ClutterActor
+               +----ClutterText
                      +----CtkText
 

 
@@ -64,12 +64,12 @@
 
Implemented Interfaces

 

 CtkText implements
- ClutterScriptable.

+ ClutterScriptable,  ClutterAnimatable and  AtkImplementorIface.

 
 

 
Description

 

-CtkText is a widget that internally uses ClutterText and Pango to display text
+CtkText is a widget that internally uses ClutterText and Pango to display text
 

 

 

@@ -102,7 +102,7 @@
 

 

 
ctk_text_new ()

-
ClutterActor *      ctk_text_new                        (const gchar *text);

+
ClutterActor *      ctk_text_new                        (const gchar *text);

 

 Builds a CtkText object containing text
 Defaults to enabling Pango markup
@@ -174,6 +174,6 @@
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.14

 
 
\ No newline at end of file
diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkTooltip.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkTooltip.html
--- clutk-0.3.32/doc/reference/clutk/html/CtkTooltip.html	2010-06-10 17:22:32.000000000 +0100
+++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkTooltip.html	2010-06-19 10:33:20.000000000 +0100
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -46,10 +46,10 @@
 
                    CtkTooltip;
                     CtkTooltipClass;
                     CtkTooltipPrivate;
-ClutterActor *      ctk_tooltip_new                     (ClutterActor *actor);
+ClutterActor *      ctk_tooltip_new                     (ClutterActor *actor);
 void                ctk_tooltip_set_actor               (CtkTooltip *self,
-                                                         ClutterActor *actor);
-ClutterActor *      ctk_tooltip_get_actor               (CtkTooltip *self);
+                                                         ClutterActor *actor);
+ClutterActor *      ctk_tooltip_get_actor               (CtkTooltip *self);
 void                ctk_tooltip_set_label               (CtkTooltip *self,
                                                          const gchar *label);
 const gchar *       ctk_tooltip_get_label               (CtkTooltip *self);
@@ -64,7 +64,7 @@
 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkTooltip
 

@@ -73,7 +73,7 @@
 
Implemented Interfaces

 

 CtkTooltip implements
- ClutterScriptable and  CtkFocusable.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface and  CtkFocusable.

 
 

 
Properties

@@ -85,7 +85,7 @@
 

 
Description

 

-CtkTooltip Provides a widget to show a tooltip on a given ClutterActor object
+CtkTooltip Provides a widget to show a tooltip on a given ClutterActor object
 

 

 

@@ -118,7 +118,7 @@
 

 

 
ctk_tooltip_new ()

-
ClutterActor *      ctk_tooltip_new                     (ClutterActor *actor);

+
ClutterActor *      ctk_tooltip_new                     (ClutterActor *actor);

 

 Creates a new ctk_tooltip object thats attached to actor
 

@@ -127,7 +127,7 @@
- @@ -142,9 +142,9 @@

ctk_tooltip_set_actor ()

void                ctk_tooltip_set_actor               (CtkTooltip *self,
-                                                         ClutterActor *actor);
+ ClutterActor *actor);

-sets self to use actor as the ClutterActor its attached to +sets self to use actor as the ClutterActor its attached to

trough :

a Pointer to a ClutterActor object +a Pointer to a ClutterActor object

slider :

a Pointer to a ClutterActor object +a Pointer to a ClutterActor object

actor :

a ClutterActor +a ClutterActor
@@ -156,7 +156,7 @@ - @@ -165,7 +165,7 @@

ctk_tooltip_get_actor ()

-
ClutterActor *      ctk_tooltip_get_actor               (CtkTooltip *self);
+
ClutterActor *      ctk_tooltip_get_actor               (CtkTooltip *self);

Retrives the actor self is attached to

@@ -179,7 +179,7 @@
- @@ -296,6 +296,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkToplevel.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkToplevel.html --- clutk-0.3.32/doc/reference/clutk/html/CtkToplevel.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkToplevel.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -46,10 +46,10 @@ 
                    CtkToplevel;
                     CtkToplevelClass;
                     CtkToplevelPrivate;
-ClutterActor *      ctk_toplevel_get_default_for_stage  (ClutterActor *stage);
+ClutterActor *      ctk_toplevel_get_default_for_stage  (ClutterActor *stage);
 void                ctk_toplevel_set_focus              (CtkToplevel *self,
                                                          CtkFocusable *focusable);
-ClutterActor *      ctk_toplevel_get_stage              (CtkToplevel *self);
+ClutterActor *      ctk_toplevel_get_stage              (CtkToplevel *self);
@@ -57,7 +57,7 @@ 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkBin
                            +----CtkToplevel
@@ -67,12 +67,12 @@
 
Implemented Interfaces

 

 CtkToplevel implements
- ClutterScriptable,  CtkFocusable and  ClutterContainer.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface,  CtkFocusable and  ClutterContainer.

Properties

-  "stage"                    ClutterStage*         : Read / Write / Construct
+  "stage"                    ClutterStage*         : Read / Write / Construct
@@ -112,7 +112,7 @@

ctk_toplevel_get_default_for_stage ()

-
ClutterActor *      ctk_toplevel_get_default_for_stage  (ClutterActor *stage);
+
ClutterActor *      ctk_toplevel_get_default_for_stage  (ClutterActor *stage);

actor :

a ClutterActor +a ClutterActor

Returns :

 a ClutterActor + a ClutterActor
@@ -157,7 +157,7 @@

ctk_toplevel_get_stage ()

-
ClutterActor *      ctk_toplevel_get_stage              (CtkToplevel *self);
+
ClutterActor *      ctk_toplevel_get_stage              (CtkToplevel *self);

Retrives the stage this toplevel element is attached to

@@ -171,7 +171,7 @@
- @@ -182,13 +182,13 @@

Property Details

The "stage" property

-
  "stage"                    ClutterStage*         : Read / Write / Construct
+
  "stage"                    ClutterStage*         : Read / Write / Construct

ClutterStage.

- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/CtkVBox.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkVBox.html --- clutk-0.3.32/doc/reference/clutk/html/CtkVBox.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/CtkVBox.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -43,7 +43,7 @@

Synopsis

                    CtkVBox;
                     CtkVBoxClass;
-ClutterActor *      ctk_vbox_new                        (guint spacing);
+ClutterActor *      ctk_vbox_new                        (guint spacing);
@@ -51,7 +51,7 @@ 
   GObject
    +----GInitiallyUnowned
-         +----ClutterActor
+         +----ClutterActor
                +----CtkActor
                      +----CtkBox
                            +----CtkVBox
@@ -61,7 +61,7 @@
 
Implemented Interfaces

 

 CtkVBox implements
- ClutterScriptable,  CtkFocusable and  ClutterContainer.

+ ClutterScriptable,  ClutterAnimatable,  AtkImplementorIface,  CtkFocusable and  ClutterContainer.

Description

@@ -90,7 +90,7 @@

ctk_vbox_new ()

-
ClutterActor *      ctk_vbox_new                        (guint spacing);
+
ClutterActor *      ctk_vbox_new                        (guint spacing);

creates a new CtkVBox

@@ -118,6 +118,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14
\ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/index.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/index.html --- clutk-0.3.32/doc/reference/clutk/html/index.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/index.html 2010-06-19 10:33:20.000000000 +0100 @@ -6,7 +6,7 @@ - + @@ -112,6 +112,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.14 \ No newline at end of file diff -Nru clutk-0.3.32/doc/reference/clutk/html/index.sgml clutk-0.3.32+0opengles2/doc/reference/clutk/html/index.sgml --- clutk-0.3.32/doc/reference/clutk/html/index.sgml 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/index.sgml 2010-06-19 10:33:19.000000000 +0100 @@ -1,4 +1,3 @@ - @@ -514,6 +513,11 @@ + + + + + diff -Nru clutk-0.3.32/doc/reference/clutk/html/object-tree.html clutk-0.3.32+0opengles2/doc/reference/clutk/html/object-tree.html --- clutk-0.3.32/doc/reference/clutk/html/object-tree.html 2010-06-10 17:22:32.000000000 +0100 +++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/object-tree.html 2010-06-19 10:33:20.000000000 +0100 @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ 
     GObject
         GInitiallyUnowned
-            ClutterActor
+            ClutterActor
                 CtkActor
                     CtkBin
                         CtkButton
@@ -41,7 +41,7 @@
                     CtkMenu
                     CtkMenuSeperator
                     CtkTooltip
-                ClutterText
+                ClutterText
                     CtkText
             CtkEffect
                 CtkEffectBlur
@@ -55,6 +55,6 @@
 
 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.14
 
 
\ No newline at end of file
diff -Nru clutk-0.3.32/doc/reference/clutk/html/style.css clutk-0.3.32+0opengles2/doc/reference/clutk/html/style.css
--- clutk-0.3.32/doc/reference/clutk/html/style.css	2010-06-10 17:22:32.000000000 +0100
+++ clutk-0.3.32+0opengles2/doc/reference/clutk/html/style.css	2010-06-19 10:33:19.000000000 +0100
@@ -209,14 +209,6 @@
   font-weight: normal;
 }
 
-.annotation
-{
-  /* tango:aluminium 5 */
-  color: #555753;
-  font-size: 80%;
-  font-weight: normal;
-}
-
 /* code listings */
 
 .listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
diff -Nru clutk-0.3.32/doc/reference/clutk/Makefile.in clutk-0.3.32+0opengles2/doc/reference/clutk/Makefile.in
--- clutk-0.3.32/doc/reference/clutk/Makefile.in	2010-06-10 17:21:12.000000000 +0100
+++ clutk-0.3.32+0opengles2/doc/reference/clutk/Makefile.in	2010-06-19 10:09:29.000000000 +0100
@@ -148,8 +148,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -535,11 +533,8 @@
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
@@ -572,11 +567,8 @@
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	@cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
diff -Nru clutk-0.3.32/doc/reference/clutk/tmpl/ctk-gfx-private.sgml clutk-0.3.32+0opengles2/doc/reference/clutk/tmpl/ctk-gfx-private.sgml
--- clutk-0.3.32/doc/reference/clutk/tmpl/ctk-gfx-private.sgml	2010-06-10 17:22:32.000000000 +0100
+++ clutk-0.3.32+0opengles2/doc/reference/clutk/tmpl/ctk-gfx-private.sgml	2010-06-19 10:33:19.000000000 +0100
@@ -49,133 +49,6 @@
 @sh: 
 
 
-
-
-
-
-
-@fbo: 
-@shader: 
-@window_w: 
-@window_h: 
-@x: 
-@y: 
-@w: 
-@h: 
-
-
-
-
-
-
-
-@texid: 
-@texwidth: 
-@texheight: 
-@shader: 
-@window_w: 
-@window_h: 
-@x: 
-@y: 
-@w: 
-@h: 
-
-
-
-
-
-
-
-@texid: 
-@texwidth: 
-@texheight: 
-@shader: 
-@window_w: 
-@window_h: 
-@vtx: 
-
-
-
-
-
-
-
-@texid: 
-@texture_width: 
-@texture_height: 
-@red: 
-@green: 
-@blue: 
-@alpha: 
-@window_w: 
-@window_h: 
-@x: 
-@y: 
-@w: 
-@h: 
-
-
-
-
-
-
-
-@rt: 
-@shader: 
-@sigma: 
-@window_w: 
-@window_h: 
-@x: 
-@y: 
-@w: 
-@h: 
-
-
-
-
-
-
-
-@fbo: 
-@texid: 
-@texture_width: 
-@texture_height: 
-@shader: 
-@window_w: 
-@window_h: 
-@x: 
-@y: 
-@w: 
-@h: 
-
-
-
-
-
-
-
-@rt_src: 
-@u0: 
-@v0: 
-@u1: 
-@v1: 
-@rt_dst: 
-@x_dst: 
-@y_dst: 
-@w_dst: 
-@h_dst: 
-
-
-
-
-
-
-
-@fxctx: 
-@rt_src: 
-@texid: 
-
-
 
 
 
diff -Nru clutk-0.3.32/doc/reference/clutk/tmpl/ctk-private.sgml clutk-0.3.32+0opengles2/doc/reference/clutk/tmpl/ctk-private.sgml
--- clutk-0.3.32/doc/reference/clutk/tmpl/ctk-private.sgml	2010-06-10 17:22:32.000000000 +0100
+++ clutk-0.3.32+0opengles2/doc/reference/clutk/tmpl/ctk-private.sgml	2010-06-19 10:33:19.000000000 +0100
@@ -29,6 +29,41 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff -Nru clutk-0.3.32/doc/reference/Makefile.in clutk-0.3.32+0opengles2/doc/reference/Makefile.in
--- clutk-0.3.32/doc/reference/Makefile.in	2010-06-10 17:21:11.000000000 +0100
+++ clutk-0.3.32+0opengles2/doc/reference/Makefile.in	2010-06-19 10:09:29.000000000 +0100
@@ -181,8 +181,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
diff -Nru clutk-0.3.32/gtk-doc.make clutk-0.3.32+0opengles2/gtk-doc.make
--- clutk-0.3.32/gtk-doc.make	2010-06-10 17:21:08.000000000 +0100
+++ clutk-0.3.32+0opengles2/gtk-doc.make	2010-06-19 10:09:23.000000000 +0100
@@ -75,11 +75,8 @@
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
@@ -112,11 +109,8 @@
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	@cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
diff -Nru clutk-0.3.32/Makefile.in clutk-0.3.32+0opengles2/Makefile.in
--- clutk-0.3.32/Makefile.in	2010-06-10 17:21:12.000000000 +0100
+++ clutk-0.3.32+0opengles2/Makefile.in	2010-06-19 10:09:30.000000000 +0100
@@ -221,8 +221,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 Q = $(V:1=)
 RANLIB = @RANLIB@
 SED = @SED@
diff -Nru clutk-0.3.32/tests/Makefile.am clutk-0.3.32+0opengles2/tests/Makefile.am
--- clutk-0.3.32/tests/Makefile.am	2010-06-09 10:04:09.000000000 +0100
+++ clutk-0.3.32+0opengles2/tests/Makefile.am	2010-06-19 10:09:12.000000000 +0100
@@ -3,6 +3,16 @@
   test-clutk-perf \
   test-clutk-text
 
+noinst_PROGRAMS = \
+   test-clutk-text
+
+#  test-clutk \
+#  test-clutk-perf \
+#  test-clutk-text \
+#  test-clutk-glow \
+#  test-clutk-blur \
+#  test-clutk-drop-shadow
+
 test_clutk_SOURCES = \
   test-actor.c \
   test-clutk.c \
diff -Nru clutk-0.3.32/tests/Makefile.in clutk-0.3.32+0opengles2/tests/Makefile.in
--- clutk-0.3.32/tests/Makefile.in	2010-06-10 17:21:12.000000000 +0100
+++ clutk-0.3.32+0opengles2/tests/Makefile.in	2010-06-19 10:09:30.000000000 +0100
@@ -14,6 +14,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -35,6 +36,7 @@
 host_triplet = @host@
 check_PROGRAMS = test-clutk$(EXEEXT) test-clutk-perf$(EXEEXT) \
 	test-clutk-text$(EXEEXT)
+noinst_PROGRAMS = test-clutk-text$(EXEEXT)
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -53,6 +55,7 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
 am_test_clutk_OBJECTS = test_clutk-test-actor.$(OBJEXT) \
 	test_clutk-test-clutk.$(OBJEXT) test_clutk-test-dnd.$(OBJEXT) \
 	test_clutk-test-em-support.$(OBJEXT) \
@@ -188,8 +191,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -251,6 +252,13 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+
+#  test-clutk \
+#  test-clutk-perf \
+#  test-clutk-text \
+#  test-clutk-glow \
+#  test-clutk-blur \
+#  test-clutk-drop-shadow
 test_clutk_SOURCES = \
   test-actor.c \
   test-clutk.c \
@@ -392,6 +400,15 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 test-clutk$(EXEEXT): $(test_clutk_OBJECTS) $(test_clutk_DEPENDENCIES) 
 	@rm -f test-clutk$(EXEEXT)
 	$(LINK) $(test_clutk_OBJECTS) $(test_clutk_LDADD) $(LIBS)
@@ -732,7 +749,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
-all-am: Makefile
+all-am: Makefile $(PROGRAMS)
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -760,7 +777,7 @@
 clean: clean-am
 
 clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
+	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -831,15 +848,15 @@
 .MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	clean-checkPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am
diff -Nru clutk-0.3.32/vapi/Makefile.in clutk-0.3.32+0opengles2/vapi/Makefile.in
--- clutk-0.3.32/vapi/Makefile.in	2010-06-10 17:21:12.000000000 +0100
+++ clutk-0.3.32+0opengles2/vapi/Makefile.in	2010-06-19 10:09:30.000000000 +0100
@@ -166,8 +166,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 Q = @Q@
 RANLIB = @RANLIB@
 SED = @SED@

Returns :

 A ClutterStage object + A ClutterStage object