diff options
| author | Simon McVittie <smcv@debian.org> | 2020-06-25 10:44:09 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2020-06-25 10:44:09 +0100 |
| commit | 2bf51495f0014a1ff6ff46ec55b93d0dd0127525 (patch) | |
| tree | 6a408fe47b83b7571c9183f8b4c0f4892d4b0aaa | |
| parent | 8afb98552def0e6946a03ab90fdeabec4398ef5f (diff) | |
| parent | c8d94f9e11f724b8fffcca8bada09dd9819f7952 (diff) | |
Update upstream source from tag 'upstream/1.22.8'
Update to upstream version '1.22.8'
with Debian dir 1e6d3f21a4a53b217a96da0a335025a6adc58f06
195 files changed, 1956 insertions, 1518 deletions
diff --git a/Makefile.in b/Makefile.in index a4261448..bd0882d7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -193,7 +193,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/README.in \ $(top_srcdir)/build/config.rpath \ $(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \ $(top_srcdir)/build/ltmain.sh $(top_srcdir)/build/missing \ - ABOUT-NLS COPYING ChangeLog NEWS + ABOUT-NLS COPYING ChangeLog NEWS README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -1,3 +1,14 @@ +Cogl 1.22.8 2020-06-04 + + • List of changes since Cogl 1.22.6 + + » Fix building against libglvnd-provided EGL headers [!19; Simon McVittie] + » Stop checking the Automake version [!20; Simon McVittie] + » Fix compiler warnings with GCC ≥ 9 [!21; Simon McVittie] + » Ensure we don't close the same X display twice [!23; Simon McVittie] + » Test suite fixes [!10, !11, !12, !14, !15, !22; Simon McVittie] + » Free pipeline state last [#14] + Cogl 1.22.6 2020-03-09 • List of changes since Cogl 1.22.4 @@ -0,0 +1,177 @@ +README for Cogl 1.22.8 +=============================================================================== + +Note: This file is delimited with -- markers so it is possible to split +sections out for other purposes, such as for release notes. + +-- +DESCRIPTION +------------------------------------------------------------------------------- + +Cogl is a small open source library for using 3D graphics hardware for +rendering. The API departs from the flat state machine style of OpenGL and is +designed to make it easy to write orthogonal components that can render without +stepping on each others toes. + +As well as aiming for a nice API, we think having a single library as opposed +to an API specification like OpenGL has a few advantages too; like being +able to paper over the inconsistencies/bugs of different OpenGL +implementations in a centralized place, not to mention the myriad of OpenGL +extensions. It also means we are in a better position to provide utility +APIs that help software developers since they only need to be implemented +once and there is no risk of inconsistency between implementations. + +Having other backends, besides OpenGL, such as drm, Gallium or D3D are +options we are interested in for the future. + +-- +REQUIREMENTS +------------------------------------------------------------------------------- + +Cogl currently only requires: + + • OpenGL ≥ 1.3 (or 1.2 + multitexturing), or OpenGL ES 2.0 (or 1.1) + • GLX, AGL, WGL or an EGL implementation + +Cogl also has optional dependencies: + + • GLib ≥ 2.32.0 + - for gtype integration + • GDK-Pixbuf ≥ 2.0 + - for image loading + • Cairo ≥ 1.10 + - for debugging texture atlasing (debug builds only) + +The optional Cogl Pango library requires: + • Cairo ≥ 1.10 + • PangoCairo ≥ 1.20 + +The optional Cogl GStreamer library requires: + + • GStreamer 1.0 + +On X11, Cogl depends on the following extensions + + • XComposite ≥ 0.4 + • XDamage + • XExt + • XFixes ≥ 3 + +For the Wayland backend, Cogl requires: + • Wayland ≥ 1.0.0 + +When running with OpenGL, Cogl requires at least version 1.3 +or 1.2 with the multitexturing extension. However to build Cogl +you will need the latest GL headers which can be obtained from: + + http://www.khronos.org + +If you are building the API reference you will also need: + + • GTK-Doc ≥ 1.13 + +If you are building the additional documentation you will also need: + + • xsltproc + • jw (optional, for generating PDFs) + +If you are building the Introspection data you will also need: + + • GObject-Introspection ≥ 0.9.5 + +GObject-Introspection is available from: + + git://git.gnome.org/gobject-introspection + +If you want support for profiling Cogl you will also need: + + • UProf ≥ 0.3 + +UProf is available from: + + git://github.com/rib/UProf.git + +-- +DOCUMENTATION +------------------------------------------------------------------------------- + +The 1.x stable API is documented here: + + http://developer.gnome.org/cogl/stable/ + +The 1.x development API is documented here: + + http://developer.gnome.org/cogl/1.22 + +The experimental 2.0 API is documented here: + + http://cogl3d.org/cogl2-reference/ + +-- +LICENSE +------------------------------------------------------------------------------- +Most of Cogl is licensed under the terms of the MIT license. There are +also some files under the SGI Free Software License B, version 2.0, +cogl-point-in-poly.c is under a 3 clause BSD license and stb_image.c +is public domain. Please see individual files for details. + +deps/glib is licensed under the LGPL (please see individual files for +details and deps/glib/COPYING for a copy of the LGPL license) This +code is only referenced when building Cogl with the --enable-standalone +configure option. + +-- +BUILDING AND INSTALLATION +------------------------------------------------------------------------------- + +Please refer to the INSTALL document. + +-- +BUGS +------------------------------------------------------------------------------- + +Please report bugs here: + + http://bugzilla.gnome.org/enter_bug.cgi?product=cogl + +You will need a Bugzilla account. + +Please include the following in bug reports: + + • what system you're running Cogl on; + • which version of Cogl you are using; + • which version of GLib and OpenGL (or OpenGL ES) you are using; + • which video card and which drivers you are using, including output of + glxinfo and xdpyinfo (if applicable); + • how to reproduce the bug. + +If you cannot reproduce the bug with one of the tests that come with +Cogl's source code, it can help a lot to include a small test case +displaying the bad behaviour. + +If the bug exposes a crash, the exact text printed out and a stack trace +obtained using gdb are greatly appreciated. + +-- +CONTRIBUTING +------------------------------------------------------------------------------- + +The CODING_STYLE file describes the coding style we use throughout Cogl, +please try your best to conform to this style because the consistency +really helps keep the code maintainable. + +We can accept contributions in several ways: + • Either as patches attached to bugs on bugzilla + - For this you may be interested in using git-bz. + + See http://git.fishsoup.net/man/git-bz.html for details + • You can email us patches + - For this we recommend using git-send-email + + • You can create a remote branch and ask us to pull from that for more + substantial changes. + - For this we recommend using github. + +Ideally standalone patches should be created using git format-patch since +that makes it easiest to import the patch with a commit message into a +git repository. @@ -20,222 +20,6 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -# Increment this whenever this file is changed. -#serial 3 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl - -dnl We can't use PKG_PREREQ because that needs 0.29. -m4_ifndef([PKG_PROG_PKG_CONFIG], - [pkg.m4 version 0.28 or later is required]) - -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - min_glib_version=ifelse([$1], [], [2.0.0], [$1]) - pkg_config_args="glib-2.0 >= $min_glib_version" - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done - - PKG_PROG_PKG_CONFIG([0.16]) - - no_glib="" - - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi - - dnl For GLIB_CFLAGS and GLIB_LIBS - PKG_CHECK_MODULES([GLIB], [$pkg_config_args], [:], [:]) - - dnl For the tools - PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal]) - PKG_CHECK_VAR([GOBJECT_QUERY], [glib-2.0], [gobject_query]) - PKG_CHECK_VAR([GLIB_MKENUMS], [glib-2.0], [glib_mkenums]) - PKG_CHECK_VAR([GLIB_COMPILE_RESOURCES], [gio-2.0], [glib_compile_resources]) - - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include <glib.h> -#include <stdio.h> -#include <stdlib.h> - -int -main (void) -{ - unsigned int major, minor, micro; - - fclose (fopen ("conf.glibtest", "w")); - - if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include <glib.h> -#include <stdio.h> -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - GLIB_COMPILE_RESOURCES="" - ifelse([$3], , :, [$3]) - fi - rm -f conf.glibtest -]) - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 11 (pkg-config-0.29.1) @@ -580,6 +364,222 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES +# Configure paths for GLIB +# Owen Taylor 1997-2001 + +# Increment this whenever this file is changed. +#serial 3 + +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl + +dnl We can't use PKG_PREREQ because that needs 0.29. +m4_ifndef([PKG_PROG_PKG_CONFIG], + [pkg.m4 version 0.28 or later is required]) + +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + min_glib_version=ifelse([$1], [], [2.0.0], [$1]) + pkg_config_args="glib-2.0 >= $min_glib_version" + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done + + PKG_PROG_PKG_CONFIG([0.16]) + + no_glib="" + + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi + + dnl For GLIB_CFLAGS and GLIB_LIBS + PKG_CHECK_MODULES([GLIB], [$pkg_config_args], [:], [:]) + + dnl For the tools + PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal]) + PKG_CHECK_VAR([GOBJECT_QUERY], [glib-2.0], [gobject_query]) + PKG_CHECK_VAR([GLIB_MKENUMS], [glib-2.0], [glib_mkenums]) + PKG_CHECK_VAR([GLIB_COMPILE_RESOURCES], [gio-2.0], [glib_compile_resources]) + + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi + + if test x"$no_glib" = x ; then + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include <glib.h> +#include <stdio.h> +#include <stdlib.h> + +int +main (void) +{ + unsigned int major, minor, micro; + + fclose (fopen ("conf.glibtest", "w")); + + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include <glib.h> +#include <stdio.h> +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + ifelse([$3], , :, [$3]) + fi + rm -f conf.glibtest +]) + # Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/cogl-pango/cogl-pango.rc b/cogl-pango/cogl-pango.rc index 10370c61..476b8d47 100644 --- a/cogl-pango/cogl-pango.rc +++ b/cogl-pango/cogl-pango.rc @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,22,6,0 - PRODUCTVERSION 1,22,6,0 + FILEVERSION 1,22,8,0 + PRODUCTVERSION 1,22,8,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "Intel Corporation" VALUE "FileDescription", "cogl-pango" - VALUE "FileVersion", "1.22.6.0" + VALUE "FileVersion", "1.22.8.0" VALUE "InternalName", "libcogl-pango-1.0-4" VALUE "LegalCopyright", "Copyright 1995-2011 © Intel Corporation" VALUE "OriginalFilename", "libcogl-pango-1.0-4.dll" VALUE "ProductName", "cogl-pango" - VALUE "ProductVersion", "1.22.6" + VALUE "ProductVersion", "1.22.8" END END BLOCK "VarFileInfo" diff --git a/cogl/cogl-pipeline.c b/cogl/cogl-pipeline.c index b2fee10d..e8d6e97d 100644 --- a/cogl/cogl-pipeline.c +++ b/cogl/cogl-pipeline.c @@ -492,9 +492,6 @@ _cogl_pipeline_free (CoglPipeline *pipeline) _cogl_bitmask_destroy (&uniforms_state->changed_mask); } - if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE) - g_slice_free (CoglPipelineBigState, pipeline->big_state); - if (pipeline->differences & COGL_PIPELINE_STATE_LAYERS) { g_list_foreach (pipeline->layer_differences, @@ -508,6 +505,9 @@ _cogl_pipeline_free (CoglPipeline *pipeline) if (pipeline->differences & COGL_PIPELINE_STATE_FRAGMENT_SNIPPETS) _cogl_pipeline_snippet_list_free (&pipeline->big_state->fragment_snippets); + if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE) + g_slice_free (CoglPipelineBigState, pipeline->big_state); + g_list_free (pipeline->deprecated_get_layers_list); recursively_free_layer_caches (pipeline); diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl-xlib-renderer.c index 8801c1cb..8a5d8d81 100644 --- a/cogl/cogl-xlib-renderer.c +++ b/cogl/cogl-xlib-renderer.c @@ -570,7 +570,10 @@ _cogl_xlib_renderer_disconnect (CoglRenderer *renderer) renderer->outputs = NULL; if (!renderer->foreign_xdpy && xlib_renderer->xdpy) - XCloseDisplay (xlib_renderer->xdpy); + { + XCloseDisplay (xlib_renderer->xdpy); + xlib_renderer->xdpy = NULL; + } unregister_xlib_renderer (renderer); } diff --git a/cogl/cogl.rc b/cogl/cogl.rc index 72e2d4ee..30a2003e 100644 --- a/cogl/cogl.rc +++ b/cogl/cogl.rc @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,22,6,0 - PRODUCTVERSION 1,22,6,0 + FILEVERSION 1,22,8,0 + PRODUCTVERSION 1,22,8,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "Intel Corporation" VALUE "FileDescription", "cogl" - VALUE "FileVersion", "1.22.6.0" + VALUE "FileVersion", "1.22.8.0" VALUE "InternalName", "libcogl-1.0-4" VALUE "LegalCopyright", "Copyright 1995-2011 © Intel Corporation" VALUE "OriginalFilename", "libcogl-1.0-4.dll" VALUE "ProductName", "cogl" - VALUE "ProductVersion", "1.22.6" + VALUE "ProductVersion", "1.22.8" END END BLOCK "VarFileInfo" diff --git a/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/driver/gl/gles/cogl-driver-gles.c index e94449f4..d8d1d0ad 100644 --- a/cogl/driver/gl/gles/cogl-driver-gles.c +++ b/cogl/driver/gl/gles/cogl-driver-gles.c @@ -201,6 +201,7 @@ _cogl_driver_pixel_format_to_gl (CoglContext *context, case COGL_PIXEL_FORMAT_ANY: case COGL_PIXEL_FORMAT_YUV: + default: g_assert_not_reached (); break; } diff --git a/config.h.in b/config.h.in index 2d7cf705..e8a830cf 100644 --- a/config.h.in +++ b/config.h.in @@ -97,6 +97,9 @@ /* 'va_lists' cannot be copies as values */ #undef G_VA_COPY_AS_ARRAY +/* Define to 1 if you have the `alarm' function. */ +#undef HAVE_ALARM + /* Define to 1 if you have the <alloca.h> header file. */ #undef HAVE_ALLOCA_H @@ -148,6 +151,9 @@ /* Define to 1 if you have the <EGL/eglext.h> header file. */ #undef HAVE_EGL_EGLEXT_H +/* Define to 1 if you have the <EGL/eglmesaext.h> header file. */ +#undef HAVE_EGL_EGLMESAEXT_H + /* Define to 1 if you have the <EGL/egl.h> header file. */ #undef HAVE_EGL_EGL_H diff --git a/config.h.win32 b/config.h.win32 index 7e4faf20..a5932860 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -519,7 +519,7 @@ #define PACKAGE_NAME "cogl" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "cogl 1.22.6" +#define PACKAGE_STRING "cogl 1.22.8" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "cogl" @@ -528,7 +528,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.22.6" +#define PACKAGE_VERSION "1.22.8" /* Maximum POSIX RT priority */ /* #undef POSIX_MAX_PRIORITY */ @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for cogl 1.22.6. +# Generated by GNU Autoconf 2.69 for cogl 1.22.8. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='cogl' PACKAGE_TARNAME='cogl' -PACKAGE_VERSION='1.22.6' -PACKAGE_STRING='cogl 1.22.6' +PACKAGE_VERSION='1.22.8' +PACKAGE_STRING='cogl 1.22.8' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -630,6 +630,7 @@ ac_includes_default="\ #endif" gt_needs= +ac_func_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -1613,7 +1614,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures cogl 1.22.6 to adapt to many kinds of systems. +\`configure' configures cogl 1.22.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1687,7 +1688,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cogl 1.22.6:";; + short | recursive ) echo "Configuration of cogl 1.22.8:";; esac cat <<\_ACEOF @@ -1940,7 +1941,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cogl configure 1.22.6 +cogl configure 1.22.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2712,7 +2713,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cogl $as_me 1.22.6, which was +It was created by cogl $as_me 1.22.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2993,6 +2994,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} fi gt_needs="$gt_needs " +as_fn_append ac_func_list " alarm" # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -4995,7 +4997,7 @@ fi # Define the identity of the package. PACKAGE='cogl' - VERSION='1.22.6' + VERSION='1.22.8' # Some tools Automake needs. @@ -5380,15 +5382,15 @@ COGL_API_VERSION_AM=$COGL_MAJOR_VERSION\_0 COGL_1_MINOR_VERSION=22 -COGL_1_MICRO_VERSION=6 +COGL_1_MICRO_VERSION=8 -COGL_1_VERSION=1.22.6 +COGL_1_VERSION=1.22.8 COGL_LT_CURRENT=24 -COGL_LT_REVISION=2 +COGL_LT_REVISION=3 COGL_LT_AGE=4 @@ -18081,7 +18083,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -cogl config.lt 1.22.6 +cogl config.lt 1.22.8 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -24156,12 +24158,26 @@ if test "x$ac_cv_header_EGL_eglext_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_EGL_EGLEXT_H 1 _ACEOF - COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE + COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES #include <EGL/eglext.h>" fi done + for ac_header in EGL/eglmesaext.h +do : + ac_fn_c_check_header_compile "$LINENO" "EGL/eglmesaext.h" "ac_cv_header_EGL_eglmesaext_h" "$COGL_EGL_INCLUDES +" +if test "x$ac_cv_header_EGL_eglmesaext_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_EGL_EGLMESAEXT_H 1 +_ACEOF + COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES +#include <EGL/eglmesaext.h>" +fi + +done + # Check for a GLES 1.x Common Profile library with/without EGL. # @@ -25515,6 +25531,22 @@ fi done + for ac_header in EGL/eglmesaext.h +do : + ac_fn_c_check_header_compile "$LINENO" "EGL/eglmesaext.h" "ac_cv_header_EGL_eglmesaext_h" "#include <EGL/egl.h> +#include <EGL/eglext.h> +" +if test "x$ac_cv_header_EGL_eglmesaext_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_EGL_EGLMESAEXT_H 1 +_ACEOF + +else + as_fn_error $? "Unable to locate required EGL headers" "$LINENO" 5 +fi + +done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglInitialize in -lEGL" >&5 $as_echo_n "checking for eglInitialize in -lEGL... " >&6; } @@ -25565,7 +25597,8 @@ fi fi COGL_EGL_INCLUDES="#include <EGL/egl.h> -#include <EGL/eglext.h>" +#include <EGL/eglext.h> +#include <EGL/eglmesaext.h>" fi @@ -29071,6 +29104,25 @@ fi + + + + for ac_func in $ac_func_list +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + if test "x$enable_emscripten" = "xno"; then : for ac_func in ffs do : @@ -29920,7 +29972,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cogl $as_me 1.22.6, which was +This file was extended by cogl $as_me 1.22.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29986,7 +30038,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cogl config.status 1.22.6 +cogl config.status 1.22.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9fc1505a..b7ba95d2 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ m4_define([cogl_version], dnl Since the core Cogl library has to also maintain support for the dnl Cogl 1.x API for Clutter then we track the 1.x version separately. m4_define([cogl_1_minor_version], [22]) -m4_define([cogl_1_micro_version], [6]) +m4_define([cogl_1_micro_version], [8]) m4_define([cogl_1_version], [1.cogl_1_minor_version.cogl_1_micro_version]) dnl ================================================================ @@ -56,7 +56,7 @@ dnl ================================================================ # 5. If any interfaces have been removed since the last public release, # then set AGE to 0. m4_define([cogl_lt_current], 24) -m4_define([cogl_lt_revision], 2) +m4_define([cogl_lt_revision], 3) m4_define([cogl_lt_age], 4) # We do also tell libtool the pretty version: m4_define([cogl_lt_release], [cogl_version]) @@ -685,10 +685,15 @@ AS_IF([test "x$enable_gles1" = "xyes"], AC_SUBST([COGL_EGL_INCLUDES]) AC_CHECK_HEADERS([EGL/eglext.h], - [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE + [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES #include <EGL/eglext.h>"], [], [$COGL_EGL_INCLUDES]) + AC_CHECK_HEADERS([EGL/eglmesaext.h], + [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES +#include <EGL/eglmesaext.h>"], + [], + [$COGL_EGL_INCLUDES]) # Check for a GLES 1.x Common Profile library with/without EGL. # @@ -1216,6 +1221,12 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], [], [AC_MSG_ERROR([Unable to locate required EGL headers])], [#include <EGL/egl.h>]) + AC_CHECK_HEADERS( + [EGL/eglmesaext.h], + [], + [AC_MSG_ERROR([Unable to locate required EGL headers])], + [#include <EGL/egl.h> +#include <EGL/eglext.h>]) AC_CHECK_LIB(EGL, [eglInitialize], [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"], @@ -1226,7 +1237,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], ) COGL_EGL_INCLUDES="#include <EGL/egl.h> -#include <EGL/eglext.h>" +#include <EGL/eglext.h> +#include <EGL/eglmesaext.h>" AC_SUBST([COGL_EGL_INCLUDES]) ]) @@ -1361,6 +1373,8 @@ dnl ================================================================ dnl Checks for library functions. dnl ================================================================ +AC_CHECK_FUNCS_ONCE([alarm]) + dnl The 'ffs' function is part of C99 so it isn't always dnl available. Cogl has a fallback if needed. dnl diff --git a/doc/reference/cogl-2.0-experimental/Makefile.in b/doc/reference/cogl-2.0-experimental/Makefile.in index d65f95b4..00849c45 100644 --- a/doc/reference/cogl-2.0-experimental/Makefile.in +++ b/doc/reference/cogl-2.0-experimental/Makefile.in @@ -746,11 +746,11 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@BUILD_GTK_DOC_FALSE@distclean-local: @BUILD_GTK_DOC_FALSE@clean-local: +@BUILD_GTK_DOC_FALSE@distclean-local: @BUILD_GTK_DOC_FALSE@uninstall-local: -@BUILD_GTK_DOC_FALSE@install-data-local: @BUILD_GTK_DOC_FALSE@maintainer-clean-local: +@BUILD_GTK_DOC_FALSE@install-data-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml index 765fead4..f1f53f26 100644 --- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml +++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY version "1.22.6"> +<!ENTITY version "1.22.8"> ]> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> diff --git a/doc/reference/cogl-2.0-experimental/html/ch01.html b/doc/reference/cogl-2.0-experimental/html/ch01.html index 6b127742..25348adc 100644 --- a/doc/reference/cogl-2.0-experimental/html/ch01.html +++ b/doc/reference/cogl-2.0-experimental/html/ch01.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl 2.0 Reference Manual"> <link rel="prev" href="index.html" title="Cogl 2.0 Reference Manual"> <link rel="next" href="cogl-general-apis.html" title="General API concepts"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -59,11 +59,11 @@ combining functions.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Pipeline.html">Pipeline</a></span><span class="refpurpose"> — Functions for creating and manipulating the GPU - pipeline</span> +pipeline</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Depth-State.html">Depth State</a></span><span class="refpurpose"> — Functions for describing the depth testing - state of your GPU.</span> +state of your GPU.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Shader-snippets.html">Shader snippets</a></span><span class="refpurpose"> — Functions for creating and manipulating shader snippets</span> @@ -76,7 +76,7 @@ combining functions.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html">CoglAttributeBuffer: Buffers of vertex attributes</a></span><span class="refpurpose"> — Functions for creating and manipulating attribute - buffers</span> +buffers</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html">CoglIndexBuffer: Buffers of vertex indices</a></span><span class="refpurpose"> — Functions for creating and manipulating vertex @@ -87,7 +87,7 @@ indices.</span> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Vertex-Attributes.html">Vertex Attributes</a></span><span class="refpurpose"> — Functions for declaring and drawing vertex - attributes</span> +attributes</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Indices.html">Indices</a></span><span class="refpurpose"> — Describe vertex indices stored in a <span class="type">CoglIndexBuffer</span>.</span> @@ -97,7 +97,7 @@ indices.</span> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Primitives.html">Primitives</a></span><span class="refpurpose"> — Functions for creating, manipulating and drawing - primitives</span> +primitives</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Path-Primitives.html">Path Primitives</a></span><span class="refpurpose"></span> @@ -119,28 +119,28 @@ indices.</span> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-High-Level-Meta-Textures.html">High Level Meta Textures</a></span><span class="refpurpose"> — Interface for high-level textures built from - low-level textures like <span class="type">CoglTexture2D</span> and - <span class="type">CoglTexture3D</span>.</span> +low-level textures like <span class="type">CoglTexture2D</span> and +<span class="type">CoglTexture3D</span>.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Sub-Textures.html">Sub Textures</a></span><span class="refpurpose"> — Functions for creating and manipulating - sub-textures.</span> +sub-textures.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Sliced-Textures.html">Sliced Textures</a></span><span class="refpurpose"> — Functions for creating and manipulating 2D meta - textures that may internally be comprised of - multiple 2D textures with power-of-two sizes.</span> +textures that may internally be comprised of +multiple 2D textures with power-of-two sizes.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-X11-Texture-From-Pixmap.html">X11 Texture From Pixmap</a></span><span class="refpurpose"> — Functions for creating and manipulating 2D meta - textures derived from X11 pixmaps.</span> +textures derived from X11 pixmaps.</span> </dt> </dl></dd> <dt><span class="section"><a href="cogl-primitive-textures.html">Primitive Textures</a></span></dt> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Low-level-primitive-textures.html">Low-level primitive textures</a></span><span class="refpurpose"> — Interface for low-level textures like - <span class="type">CoglTexture2D</span> and <span class="type">CoglTexture3D</span>.</span> +<span class="type">CoglTexture2D</span> and <span class="type">CoglTexture3D</span>.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-2D-textures.html">2D textures</a></span><span class="refpurpose"> — Functions for creating and manipulating 2D textures</span> @@ -150,7 +150,7 @@ indices.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html">Rectangle textures (non-normalized coordinates)</a></span><span class="refpurpose"> — Functions for creating and manipulating rectangle - textures for use with non-normalized coordinates.</span> +textures for use with non-normalized coordinates.</span> </dt> </dl></dd> <dt><span class="section"><a href="cogl-framebuffer-apis.html">Framebuffers</a></span></dt> @@ -163,7 +163,7 @@ indices.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Offscreen-Framebuffers.html">Offscreen Framebuffers</a></span><span class="refpurpose"> — Functions for creating and manipulating offscreen - framebuffers.</span> +framebuffers.</span> </dt> </dl></dd> <dt><span class="section"><a href="cogl-utilities.html">Utilities</a></span></dt> @@ -176,11 +176,11 @@ indices.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Matrix-Stacks.html">Matrix Stacks</a></span><span class="refpurpose"> — Functions for efficiently tracking many - related transformations</span> +related transformations</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-3-Component-Vectors.html">3 Component Vectors</a></span><span class="refpurpose"> — Functions for handling single precision float - vectors.</span> +vectors.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Eulers-(Rotations).html">Eulers (Rotations)</a></span><span class="refpurpose"> — Functions for initializing and manipulating @@ -201,11 +201,11 @@ quaternions.</span> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-SDL-Integration.html">SDL Integration</a></span><span class="refpurpose"> — Integration api for the Simple DirectMedia - Layer library.</span> +Layer library.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Main-loop-integration.html">Main loop integration</a></span><span class="refpurpose"> — Functions for integrating Cogl with an - application's main loop</span> +application's main loop</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-GType-Integration-API.html">GType Integration API</a></span><span class="refpurpose"></span> @@ -227,6 +227,6 @@ quaternions.</span> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-2D-textures.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-2D-textures.html index 2afb478a..ccd9e09a 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-2D-textures.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-2D-textures.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-primitive-textures.html" title="Primitive Textures"> <link rel="prev" href="cogl-2.0-experimental-Low-level-primitive-textures.html" title="Low-level primitive textures"> <link rel="next" href="cogl-2.0-experimental-3D-textures.html" title="3D textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-2D-textures.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -94,8 +94,8 @@ <a name="cogl-2.0-experimental-2D-textures.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">Â </td> @@ -479,6 +479,6 @@ cogl_is_texture_rectangle (<em class="parameter"><code><span class="type">void</ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3-Component-Vectors.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3-Component-Vectors.html index e87e5bfc..4b972619 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3-Component-Vectors.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3-Component-Vectors.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-utilities.html" title="Utilities"> <link rel="prev" href="cogl-2.0-experimental-Matrix-Stacks.html" title="Matrix Stacks"> <link rel="next" href="cogl-2.0-experimental-Eulers-(Rotations).html" title="Eulers (Rotations)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-3-Component-Vectors.top_of_page"></a>3 Component Vectors</span></h2> <p>3 Component Vectors — Functions for handling single precision float - vectors.</p> +vectors.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-3-Component-Vectors.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -345,7 +345,7 @@ comparing the floats.</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function">fabsf</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">vector0</span><span class="symbol">-></span><span class="normal">x </span><span class="symbol">-</span><span class="normal"> vector1</span><span class="symbol">-></span><span class="normal">x</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol"><</span><span class="normal"> epsilon</span><span class="symbol">)</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="k">if</span> <span class="p">(</span><span class="n">fabsf</span> <span class="p">(</span><span class="n">vector0</span><span class="o">-></span><span class="n">x</span> <span class="o">-</span> <span class="n">vector1</span><span class="o">-></span><span class="n">x</span><span class="p">)</span> <span class="o"><</span> <span class="n">epsilon</span><span class="p">)</span></pre></td> </tr> </tbody> </table> @@ -908,7 +908,7 @@ of the normal</div> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol">(</span><span class="normal">a</span><span class="symbol">-></span><span class="normal">x </span><span class="symbol">*</span><span class="normal"> b</span><span class="symbol">-></span><span class="normal">x </span><span class="symbol">+</span><span class="normal"> a</span><span class="symbol">-></span><span class="normal">y </span><span class="symbol">*</span><span class="normal"> b</span><span class="symbol">-></span><span class="normal">y </span><span class="symbol">+</span><span class="normal"> a</span><span class="symbol">-></span><span class="normal">z </span><span class="symbol">*</span><span class="normal"> b</span><span class="symbol">-></span><span class="normal">z</span><span class="symbol">)</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">(</span><span class="n">a</span><span class="o">-></span><span class="n">x</span> <span class="o">*</span> <span class="n">b</span><span class="o">-></span><span class="n">x</span> <span class="o">+</span> <span class="n">a</span><span class="o">-></span><span class="n">y</span> <span class="o">*</span> <span class="n">b</span><span class="o">-></span><span class="n">y</span> <span class="o">+</span> <span class="n">a</span><span class="o">-></span><span class="n">z</span> <span class="o">*</span> <span class="n">b</span><span class="o">-></span><span class="n">z</span><span class="p">)</span></pre></td> </tr> </tbody> </table> @@ -922,7 +922,7 @@ angle between two vectors as:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol">|</span><span class="normal">a</span><span class="symbol">||</span><span class="normal">b</span><span class="symbol">|</span><span class="normal">cosðœƒ</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="o">|</span><span class="n">a</span><span class="o">||</span><span class="n">b</span><span class="o">|</span><span class="n">cosðœƒ</span></pre></td> </tr> </tbody> </table> @@ -1023,11 +1023,8 @@ mentioned in the release notes for the affected release. "><span class="acronym">Unstable</span></acronym></p> </div> </div> -<div class="refsect1"> -<a name="cogl-2.0-experimental-3-Component-Vectors.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3D-textures.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3D-textures.html index 6ed9b911..0686119a 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3D-textures.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-3D-textures.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-primitive-textures.html" title="Primitive Textures"> <link rel="prev" href="cogl-2.0-experimental-2D-textures.html" title="2D textures"> <link rel="next" href="cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html" title="Rectangle textures (non-normalized coordinates)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-3D-textures.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -78,8 +78,8 @@ <a name="cogl-2.0-experimental-3D-textures.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">Â </td> @@ -419,6 +419,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Bitmap.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Bitmap.html index 9ff02c37..5541045d 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Bitmap.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Bitmap.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-textures.html" title="Textures"> <link rel="prev" href="cogl-textures.html" title="Textures"> <link rel="next" href="cogl-2.0-experimental-The-Texture-Interface.html" title="The Texture Interface"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-Bitmap.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -142,8 +142,8 @@ <a name="cogl-2.0-experimental-Bitmap.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -789,9 +789,9 @@ texture</p></td> <div class="refsect2"> <a name="CoglBitmapError"></a><h3>enum CoglBitmapError</h3> <p>Error codes that can be thrown when performing bitmap -operations. Note that <a href="http://library.gnome.org/devel/gdk-pixbuf/unstable/gdk-pixbuf-File-Loading.html#gdk-pixbuf-new-from-file"><code class="function">gdk_pixbuf_new_from_file()</code></a> can also throw +operations. Note that <code class="function">gdk_pixbuf_new_from_file()</code> can also throw errors directly from the underlying image loading library. For -example, if GdkPixbuf is used then errors <a href="http://library.gnome.org/devel/gdk-pixbuf/unstable/gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbufError"><span class="type">GdkPixbufError</span></a>s +example, if GdkPixbuf is used then errors <span class="type">GdkPixbufError</span>s will be used directly.</p> <div class="refsect3"> <a name="CoglBitmapError.members"></a><h4>Members</h4> @@ -806,7 +806,7 @@ will be used directly.</p> <td class="enum_member_name"><p><a name="COGL-BITMAP-ERROR-FAILED:CAPS"></a>COGL_BITMAP_ERROR_FAILED</p></td> <td class="enum_member_description"> <p>Generic failure code, something went - wrong.</p> +wrong.</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -832,6 +832,6 @@ will be used directly.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html index 2c1936da..8c7d7a2c 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-buffer-apis.html" title="Allocating GPU Memory"> <link rel="prev" href="cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html" title="CoglBuffer: The Buffer Interface"> <link rel="next" href="cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html" title="CoglIndexBuffer: Buffers of vertex indices"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.top_of_page"></a>CoglAttributeBuffer: Buffers of vertex attributes</span></h2> <p>CoglAttributeBuffer: Buffers of vertex attributes — Functions for creating and manipulating attribute - buffers</p> +buffers</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -71,8 +71,8 @@ <a name="cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword"> </td> @@ -270,6 +270,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html index 1ae3aefc..e88b6353 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-buffer-apis.html" title="Allocating GPU Memory"> <link rel="prev" href="cogl-buffer-apis.html" title="Allocating GPU Memory"> <link rel="next" href="cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html" title="CoglAttributeBuffer: Buffers of vertex attributes"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -52,8 +52,8 @@ mentioned in the release notes for the affected release. <a name="cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -142,8 +142,8 @@ mentioned in the release notes for the affected release. <a name="cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -768,7 +768,7 @@ the buffer data is going to be updated.</p> <td class="enum_member_name"><p><a name="COGL-BUFFER-UPDATE-HINT-STREAM:CAPS"></a>COGL_BUFFER_UPDATE_HINT_STREAM</p></td> <td class="enum_member_description"> <p>the buffer will be used once or a couple of - times</p> +times</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -822,7 +822,7 @@ mentioned in the release notes for the affected release. <td class="enum_member_name"><p><a name="COGL-BUFFER-ACCESS-READ-WRITE:CAPS"></a>COGL_BUFFER_ACCESS_READ_WRITE</p></td> <td class="enum_member_description"> <p>the buffer will be used for both reading and - writing</p> +writing</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -863,9 +863,9 @@ is mapped.</p> <td class="enum_member_name"><p><a name="COGL-BUFFER-MAP-HINT-DISCARD:CAPS"></a>COGL_BUFFER_MAP_HINT_DISCARD</p></td> <td class="enum_member_description"> <p>Tells Cogl that you plan to replace - all the buffer's contents. When this flag is used to map a - buffer, the entire contents of the buffer become undefined, even - if only a subregion of the buffer is mapped.</p> +all the buffer's contents. When this flag is used to map a +buffer, the entire contents of the buffer become undefined, even +if only a subregion of the buffer is mapped.</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -873,9 +873,9 @@ is mapped.</p> <td class="enum_member_name"><p><a name="COGL-BUFFER-MAP-HINT-DISCARD-RANGE:CAPS"></a>COGL_BUFFER_MAP_HINT_DISCARD_RANGE</p></td> <td class="enum_member_description"> <p>Tells Cogl that you plan to - replace all the contents of the mapped region. The contents of - the region specified are undefined after this flag is used to - map a buffer.</p> +replace all the contents of the mapped region. The contents of +the region specified are undefined after this flag is used to +map a buffer.</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -906,6 +906,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html index 3e85a79e..5c804705 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-context-apis.html" title="Setting Up A Drawing Context"> <link rel="prev" href="cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html" title="CoglOnscreenTemplate: Describe a template for onscreen framebuffers"> <link rel="next" href="cogl-2.0-experimental-The-Top-Level-Context.html" title="The Top-Level Context"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -94,8 +94,8 @@ <a name="cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">Â </td> @@ -455,6 +455,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html index f15578fd..0d6555dd 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-framebuffer-apis.html" title="Framebuffers"> <link rel="prev" href="cogl-framebuffer-apis.html" title="Framebuffers"> <link rel="next" href="cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -516,8 +516,8 @@ <a name="cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="typedef_keyword">typedef</td> @@ -1869,17 +1869,17 @@ any other rowstride or source, please use the 9 10 11</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">bitmap </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Bitmap.html#cogl-bitmap-new-for-data">cogl_bitmap_new_for_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">context</span><span class="symbol">,</span> -<span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">,</span> -<span class="normal"> format</span><span class="symbol">,</span> -<span class="normal"> </span><span class="symbol">/<!--</span><span class="normal"> </span><span class="symbol">-->*</span><span class="normal"> rowstride </span><span class="symbol">*<!--</span><span class="normal"> </span><span class="symbol">-->/</span> -<span class="normal"> bpp </span><span class="symbol">*</span><span class="normal"> width</span><span class="symbol">,</span> -<span class="normal"> pixels</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html#cogl-framebuffer-read-pixels-into-bitmap">cogl_framebuffer_read_pixels_into_bitmap</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">framebuffer</span><span class="symbol">,</span> -<span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">,</span> -<span class="normal"> <a href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-READ-PIXELS-COLOR-BUFFER:CAPS">COGL_READ_PIXELS_COLOR_BUFFER</a></span><span class="symbol">,</span> -<span class="normal"> bitmap</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-The-Object-Interface.html#cogl-object-unref">cogl_object_unref</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">bitmap</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">bitmap</span> <span class="o">=</span> <span class="n">cogl_bitmap_new_for_data</span> <span class="p">(</span><span class="n">context</span><span class="p">,</span> + <span class="n">width</span><span class="p">,</span> <span class="n">height</span><span class="p">,</span> + <span class="n">format</span><span class="p">,</span> + <span class="o">/<!--</span> <span class="o">-->*</span> <span class="n">rowstride</span> <span class="o">*<!--</span> <span class="o">-->/</span> + <span class="n">bpp</span> <span class="o">*</span> <span class="n">width</span><span class="p">,</span> + <span class="n">pixels</span><span class="p">);</span> +<span class="n">cogl_framebuffer_read_pixels_into_bitmap</span> <span class="p">(</span><span class="n">framebuffer</span><span class="p">,</span> + <span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">,</span> + <span class="n">COGL_READ_PIXELS_COLOR_BUFFER</span><span class="p">,</span> + <span class="n">bitmap</span><span class="p">);</span> +<span class="n">cogl_object_unref</span> <span class="p">(</span><span class="n">bitmap</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -3905,49 +3905,49 @@ corresponding to the bottom right you can do so like this:</p> 41 42 43</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="type">void</span> -<span class="function">setup_viewport</span><span class="normal"> </span><span class="symbol">(</span><span class="type">unsigned</span><span class="normal"> </span><span class="type">int</span><span class="normal"> width</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">unsigned</span><span class="normal"> </span><span class="type">int</span><span class="normal"> height</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> fovy</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> aspect</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> z_near</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> z_far</span><span class="symbol">)</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> z_camera</span><span class="symbol">;</span> -<span class="normal"> </span><span class="usertype">CoglMatrix</span><span class="normal"> projection_matrix</span><span class="symbol">;</span> -<span class="normal"> </span><span class="usertype">CoglMatrix</span><span class="normal"> mv_matrix</span><span class="symbol">;</span> - -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-The-Top-Level-Context.html#cogl-set-viewport">cogl_set_viewport</a></span><span class="normal"> </span><span class="symbol">(</span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-The-Top-Level-Context.html#cogl-perspective">cogl_perspective</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">fovy</span><span class="symbol">,</span><span class="normal"> aspect</span><span class="symbol">,</span><span class="normal"> z_near</span><span class="symbol">,</span><span class="normal"> z_far</span><span class="symbol">);</span> - -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-The-Top-Level-Context.html#cogl-get-projection-matrix">cogl_get_projection_matrix</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">projection_matrix</span><span class="symbol">);</span> -<span class="normal"> z_camera </span><span class="symbol">=</span><span class="normal"> </span><span class="number">0.5</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> projection_matrix</span><span class="symbol">.</span><span class="normal">xx</span><span class="symbol">;</span> - -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Matrices.html#cogl-matrix-init-identity">cogl_matrix_init_identity</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Matrices.html#cogl-matrix-translate">cogl_matrix_translate</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">0</span><span class="symbol">.</span><span class="normal">5f</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">0</span><span class="symbol">.</span><span class="normal">5f</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="normal">z_camera</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Matrices.html#cogl-matrix-scale">cogl_matrix_scale</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">.</span><span class="normal">0f </span><span class="symbol">/</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">1</span><span class="symbol">.</span><span class="normal">0f </span><span class="symbol">/</span><span class="normal"> height</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">.</span><span class="normal">0f </span><span class="symbol">/</span><span class="normal"> width</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Matrices.html#cogl-matrix-translate">cogl_matrix_translate</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">.</span><span class="normal">0f</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">1.0</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> height</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">.</span><span class="normal">0f</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-The-Top-Level-Context.html#cogl-set-modelview-matrix">cogl_set_modelview_matrix</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">);</span> -<span class="cbracket">}</span> - -<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span> -<span class="function">my_init_framebuffer</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">ClutterStage</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">stage</span><span class="symbol">,</span> -<span class="normal"> </span><span class="usertype">CoglFramebuffer</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">framebuffer</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">unsigned</span><span class="normal"> </span><span class="type">int</span><span class="normal"> framebuffer_width</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">unsigned</span><span class="normal"> </span><span class="type">int</span><span class="normal"> framebuffer_height</span><span class="symbol">)</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="usertype">ClutterPerspective</span><span class="normal"> perspective</span><span class="symbol">;</span> - -<span class="normal"> </span><span class="function">clutter_stage_get_perspective</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stage</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">perspective</span><span class="symbol">);</span> - -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html#cogl-push-framebuffer">cogl_push_framebuffer</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">framebuffer</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">setup_viewport</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">framebuffer_width</span><span class="symbol">,</span> -<span class="normal"> framebuffer_height</span><span class="symbol">,</span> -<span class="normal"> perspective</span><span class="symbol">.</span><span class="normal">fovy</span><span class="symbol">,</span> -<span class="normal"> perspective</span><span class="symbol">.</span><span class="normal">aspect</span><span class="symbol">,</span> -<span class="normal"> perspective</span><span class="symbol">.</span><span class="normal">z_near</span><span class="symbol">,</span> -<span class="normal"> perspective</span><span class="symbol">.</span><span class="normal">z_far</span><span class="symbol">);</span> -<span class="cbracket">}</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="k">static</span> <span class="kt">void</span> +<span class="nf">setup_viewport</span> <span class="p">(</span><span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">width</span><span class="p">,</span> + <span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">height</span><span class="p">,</span> + <span class="kt">float</span> <span class="n">fovy</span><span class="p">,</span> + <span class="kt">float</span> <span class="n">aspect</span><span class="p">,</span> + <span class="kt">float</span> <span class="n">z_near</span><span class="p">,</span> + <span class="kt">float</span> <span class="n">z_far</span><span class="p">)</span> +<span class="p">{</span> + <span class="kt">float</span> <span class="n">z_camera</span><span class="p">;</span> + <span class="n">CoglMatrix</span> <span class="n">projection_matrix</span><span class="p">;</span> + <span class="n">CoglMatrix</span> <span class="n">mv_matrix</span><span class="p">;</span> + + <span class="n">cogl_set_viewport</span> <span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">width</span><span class="p">,</span> <span class="n">height</span><span class="p">);</span> + <span class="n">cogl_perspective</span> <span class="p">(</span><span class="n">fovy</span><span class="p">,</span> <span class="n">aspect</span><span class="p">,</span> <span class="n">z_near</span><span class="p">,</span> <span class="n">z_far</span><span class="p">);</span> + + <span class="n">cogl_get_projection_matrix</span> <span class="p">(</span><span class="o">&</span><span class="n">projection_matrix</span><span class="p">);</span> + <span class="n">z_camera</span> <span class="o">=</span> <span class="mf">0.5</span> <span class="o">*</span> <span class="n">projection_matrix</span><span class="p">.</span><span class="n">xx</span><span class="p">;</span> + + <span class="n">cogl_matrix_init_identity</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">);</span> + <span class="n">cogl_matrix_translate</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">,</span> <span class="o">-</span><span class="mf">0.5f</span><span class="p">,</span> <span class="o">-</span><span class="mf">0.5f</span><span class="p">,</span> <span class="o">-</span><span class="n">z_camera</span><span class="p">);</span> + <span class="n">cogl_matrix_scale</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">,</span> <span class="mf">1.0f</span> <span class="o">/</span> <span class="n">width</span><span class="p">,</span> <span class="o">-</span><span class="mf">1.0f</span> <span class="o">/</span> <span class="n">height</span><span class="p">,</span> <span class="mf">1.0f</span> <span class="o">/</span> <span class="n">width</span><span class="p">);</span> + <span class="n">cogl_matrix_translate</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">,</span> <span class="mf">0.0f</span><span class="p">,</span> <span class="o">-</span><span class="mf">1.0</span> <span class="o">*</span> <span class="n">height</span><span class="p">,</span> <span class="mf">0.0f</span><span class="p">);</span> + <span class="n">cogl_set_modelview_matrix</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">);</span> +<span class="p">}</span> + +<span class="k">static</span> <span class="kt">void</span> +<span class="nf">my_init_framebuffer</span> <span class="p">(</span><span class="n">ClutterStage</span> <span class="o">*</span><span class="n">stage</span><span class="p">,</span> + <span class="n">CoglFramebuffer</span> <span class="o">*</span><span class="n">framebuffer</span><span class="p">,</span> + <span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">framebuffer_width</span><span class="p">,</span> + <span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">framebuffer_height</span><span class="p">)</span> +<span class="p">{</span> + <span class="n">ClutterPerspective</span> <span class="n">perspective</span><span class="p">;</span> + + <span class="n">clutter_stage_get_perspective</span> <span class="p">(</span><span class="n">stage</span><span class="p">,</span> <span class="o">&</span><span class="n">perspective</span><span class="p">);</span> + + <span class="n">cogl_push_framebuffer</span> <span class="p">(</span><span class="n">framebuffer</span><span class="p">);</span> + <span class="n">setup_viewport</span> <span class="p">(</span><span class="n">framebuffer_width</span><span class="p">,</span> + <span class="n">framebuffer_height</span><span class="p">,</span> + <span class="n">perspective</span><span class="p">.</span><span class="n">fovy</span><span class="p">,</span> + <span class="n">perspective</span><span class="p">.</span><span class="n">aspect</span><span class="p">,</span> + <span class="n">perspective</span><span class="p">.</span><span class="n">z_near</span><span class="p">,</span> + <span class="n">perspective</span><span class="p">.</span><span class="n">z_far</span><span class="p">);</span> +<span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -3998,6 +3998,6 @@ All subsequent drawing will be redirected to this framebuffer.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html index aa57fa82..aa756a87 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-buffer-apis.html" title="Allocating GPU Memory"> <link rel="prev" href="cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html" title="CoglAttributeBuffer: Buffers of vertex attributes"> <link rel="next" href="cogl-buffer-layout-apis.html" title="Describing the layout of GPU Memory"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -36,8 +36,8 @@ indices.</p> <a name="cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -63,8 +63,8 @@ indices.</p> <a name="cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">Â </td> @@ -184,6 +184,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html index b7b46ee6..5951ad5e 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-framebuffer-apis.html" title="Framebuffers"> <link rel="prev" href="cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html" title="CoglFramebuffer: The Framebuffer Interface"> <link rel="next" href="cogl-2.0-experimental-Offscreen-Framebuffers.html" title="Offscreen Framebuffers"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -259,8 +259,8 @@ <a name="cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -1827,6 +1827,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html index a3991a44..9dc393ac 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-context-apis.html" title="Setting Up A Drawing Context"> <link rel="prev" href="cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html" title="CoglRenderer: Connect to a backend renderer"> <link rel="next" href="cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html" title="CoglDisplay: Setup a display pipeline"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -62,8 +62,8 @@ <a name="cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">Â </td> @@ -133,6 +133,6 @@ cogl_onscreen_template_new (<em class="parameter"><code><span class="type">CoglS </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html index b6747bbe..4696551f 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-context-apis.html" title="Setting Up A Drawing Context"> <link rel="prev" href="cogl-context-apis.html" title="Setting Up A Drawing Context"> <link rel="next" href="cogl-2.0-experimental-CoglOnscreenTemplate---Describe-a-template-for-onscreen-framebuffers.html" title="CoglOnscreenTemplate: Describe a template for onscreen framebuffers"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -221,8 +221,8 @@ <a name="cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -1160,7 +1160,7 @@ they depend on to ensure maximum portability.</p> <td class="enum_member_name"><p><a name="COGL-RENDERER-CONSTRAINT-USES-XLIB:CAPS"></a>COGL_RENDERER_CONSTRAINT_USES_XLIB</p></td> <td class="enum_member_description"> <p>Require the renderer to be X11 - based and use Xlib</p> +based and use Xlib</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1175,9 +1175,9 @@ they depend on to ensure maximum portability.</p> <td class="enum_member_name"><p><a name="COGL-RENDERER-CONSTRAINT-SUPPORTS-COGL-GLES2:CAPS"></a>COGL_RENDERER_CONSTRAINT_SUPPORTS_COGL_GLES2</p></td> <td class="enum_member_description"> <p>Require that the - renderer supports creating a <a class="link" href="cogl-2.0-experimental-GLES-2.0-context.html#CoglGLES2Context" title="CoglGLES2Context"><span class="type">CoglGLES2Context</span></a> via - <a class="link" href="cogl-2.0-experimental-GLES-2.0-context.html#cogl-gles2-context-new" title="cogl_gles2_context_new ()"><code class="function">cogl_gles2_context_new()</code></a>. This can be used to integrate GLES 2.0 - code into Cogl based applications.</p> +renderer supports creating a <a class="link" href="cogl-2.0-experimental-GLES-2.0-context.html#CoglGLES2Context" title="CoglGLES2Context"><span class="type">CoglGLES2Context</span></a> via +<a class="link" href="cogl-2.0-experimental-GLES-2.0-context.html#cogl-gles2-context-new" title="cogl_gles2_context_new ()"><code class="function">cogl_gles2_context_new()</code></a>. This can be used to integrate GLES 2.0 +code into Cogl based applications.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1217,7 +1217,7 @@ mentioned in the release notes for the affected release. <td class="enum_member_name"><p><a name="COGL-FILTER-CONTINUE:CAPS"></a>COGL_FILTER_CONTINUE</p></td> <td class="enum_member_description"> <p>The event was not handled, continues the - processing</p> +processing</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1249,6 +1249,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Color-Type.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Color-Type.html index 00b36fe5..ac7eb7c0 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Color-Type.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Color-Type.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-utilities.html" title="Utilities"> <link rel="prev" href="cogl-utilities.html" title="Utilities"> <link rel="next" href="cogl-2.0-experimental-Matrices.html" title="Matrices"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-Color-Type.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -314,8 +314,8 @@ <a name="cogl-2.0-experimental-Color-Type.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">struct</td> @@ -1452,6 +1452,6 @@ directly.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Common-Types.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Common-Types.html index 42ebe85f..13bc859a 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Common-Types.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Common-Types.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-general-apis.html" title="General API concepts"> <link rel="prev" href="cogl-2.0-experimental-Exception-handling.html" title="Exception handling"> <link rel="next" href="cogl-context-apis.html" title="Setting Up A Drawing Context"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-Common-Types.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody><tr> <td class="function_type"> @@ -52,8 +52,8 @@ <a name="cogl-2.0-experimental-Common-Types.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -816,8 +816,8 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-PIXEL-FORMAT-RG-88:CAPS"></a>COGL_PIXEL_FORMAT_RG_88</p></td> <td class="enum_member_description"> <p>RG, 16 bits. Note that red-green textures - are only available if <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-RG:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_RG</code></a> is advertised. - See <a class="link" href="cogl-2.0-experimental-The-Texture-Interface.html#cogl-texture-set-components" title="cogl_texture_set_components ()"><code class="function">cogl_texture_set_components()</code></a> for details.</p> +are only available if <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-RG:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_RG</code></a> is advertised. +See <a class="link" href="cogl-2.0-experimental-The-Texture-Interface.html#cogl-texture-set-components" title="cogl_texture_set_components ()"><code class="function">cogl_texture_set_components()</code></a> for details.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1076,7 +1076,7 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-ATTRIBUTE-TYPE-UNSIGNED-BYTE:CAPS"></a>COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE</p></td> <td class="enum_member_description"> <p>Data is the same size of an - unsigned byte</p> +unsigned byte</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1091,7 +1091,7 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-ATTRIBUTE-TYPE-UNSIGNED-SHORT:CAPS"></a>COGL_ATTRIBUTE_TYPE_UNSIGNED_SHORT</p></td> <td class="enum_member_description"> <p>Data is the same size of - an unsigned short integer</p> +an unsigned short integer</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1193,10 +1193,10 @@ drawing something.</p> <td class="enum_member_name"><p><a name="COGL-TEXTURE-NO-AUTO-MIPMAP:CAPS"></a>COGL_TEXTURE_NO_AUTO_MIPMAP</p></td> <td class="enum_member_description"> <p>Disables the automatic generation of - the mipmap pyramid from the base level image whenever it is - updated. The mipmaps are only generated when the texture is - rendered with a mipmap filter so it should be free to leave out - this flag when using other filtering modes</p> +the mipmap pyramid from the base level image whenever it is +updated. The mipmaps are only generated when the texture is +rendered with a mipmap filter so it should be free to leave out +this flag when using other filtering modes</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1211,7 +1211,7 @@ drawing something.</p> <td class="enum_member_name"><p><a name="COGL-TEXTURE-NO-ATLAS:CAPS"></a>COGL_TEXTURE_NO_ATLAS</p></td> <td class="enum_member_description"> <p>Disables the insertion of the texture inside - the texture atlas used by Cogl</p> +the texture atlas used by Cogl</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1240,6 +1240,6 @@ justifications. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Depth-State.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Depth-State.html index bf0f4892..003cd7d6 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Depth-State.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Depth-State.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-pipeline-apis.html" title="Setting Up A GPU Pipeline"> <link rel="prev" href="cogl-2.0-experimental-Pipeline.html" title="Pipeline"> <link rel="next" href="cogl-2.0-experimental-Shader-snippets.html" title="Shader snippets"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Depth-State.top_of_page"></a>Depth State</span></h2> <p>Depth State — Functions for describing the depth testing - state of your GPU.</p> +state of your GPU.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Depth-State.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -119,8 +119,8 @@ <a name="cogl-2.0-experimental-Depth-State.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -690,6 +690,6 @@ value greater than or equal to the value currently in the depth buffer.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Eulers-(Rotations).html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Eulers-(Rotations).html index 44b56588..6360e5e4 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Eulers-(Rotations).html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Eulers-(Rotations).html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-utilities.html" title="Utilities"> <link rel="prev" href="cogl-2.0-experimental-3-Component-Vectors.html" title="3 Component Vectors"> <link rel="next" href="cogl-2.0-experimental-Quaternions-(Rotations).html" title="Quaternions (Rotations)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -36,8 +36,8 @@ euler angles.</p> <a name="cogl-2.0-experimental-Eulers-(Rotations).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -95,8 +95,8 @@ euler angles.</p> <a name="cogl-2.0-experimental-Eulers-(Rotations).other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">Â </td> @@ -446,6 +446,6 @@ you want to do interpolation between 3d rotations.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Exception-handling.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Exception-handling.html index d3aeb3c5..08eb877c 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Exception-handling.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Exception-handling.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-general-apis.html" title="General API concepts"> <link rel="prev" href="cogl-2.0-experimental-The-Object-Interface.html" title="The Object Interface"> <link rel="next" href="cogl-2.0-experimental-Common-Types.html" title="Common Types"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-Exception-handling.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -76,8 +76,8 @@ <a name="cogl-2.0-experimental-Exception-handling.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="define_keyword">#define</td> @@ -103,8 +103,8 @@ takes an error argument:</p> <tr> <td class="listing_lines" align="right"><pre>1 2</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal"><a href="cogl-2.0-experimental-The-Top-Level-Context.html#CoglContext">CoglContext</a> </span><span class="symbol">*</span> -<span class="function"><a href="cogl-2.0-experimental-The-Top-Level-Context.html#cogl-context-new">cogl_context_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">CoglDisplay</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">display</span><span class="symbol">,</span><span class="normal"> </span><span class="usertype">CoglError</span><span class="normal"> </span><span class="symbol">**</span><span class="normal">error</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglContext</span> <span class="o">*</span> +<span class="nf">cogl_context_new</span> <span class="p">(</span><span class="n">CoglDisplay</span> <span class="o">*</span><span class="n">display</span><span class="p">,</span> <span class="n">CoglError</span> <span class="o">**</span><span class="n">error</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -122,10 +122,10 @@ that has first been initialized to <code class="literal">NULL</code> as follows: 2 3 4</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglError</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">error </span><span class="symbol">=</span><span class="normal"> NULL</span><span class="symbol">;</span> -<span class="usertype">CoglContext</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">context</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglError</span> <span class="o">*</span><span class="n">error</span> <span class="o">=</span> <span class="nb">NULL</span><span class="p">;</span> +<span class="n">CoglContext</span> <span class="o">*</span><span class="n">context</span><span class="p">;</span> -<span class="normal">context </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-The-Top-Level-Context.html#cogl-context-new">cogl_context_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">NULL</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">error</span><span class="symbol">);</span></pre></td> +<span class="n">context</span> <span class="o">=</span> <span class="n">cogl_context_new</span> <span class="p">(</span><span class="nb">NULL</span><span class="p">,</span> <span class="o">&</span><span class="n">error</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -150,13 +150,13 @@ abort without attempting to recover.</p> 5 6 7</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">context </span><span class="symbol">==</span><span class="normal"> NULL</span><span class="symbol">)</span> -<span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="function">fprintf</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stderr</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Failed to create a Cogl context: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span> -<span class="normal"> error</span><span class="symbol">-></span><span class="normal">message</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Exception-handling.html#cogl-error-free">cogl_error_free</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">abort</span><span class="normal"> </span><span class="symbol">();</span> -<span class="normal"> </span><span class="cbracket">}</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="k">if</span> <span class="p">(</span><span class="n">context</span> <span class="o">==</span> <span class="nb">NULL</span><span class="p">)</span> + <span class="p">{</span> + <span class="n">fprintf</span> <span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"Failed to create a Cogl context: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> + <span class="n">error</span><span class="o">-></span><span class="n">message</span><span class="p">);</span> + <span class="n">cogl_error_free</span> <span class="p">(</span><span class="n">error</span><span class="p">);</span> + <span class="n">abort</span> <span class="p">();</span> + <span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -346,6 +346,6 @@ GError api.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GLES-2.0-context.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GLES-2.0-context.html index 028fc5ac..9e4798a1 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GLES-2.0-context.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GLES-2.0-context.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-integration.html" title="Binding and Integrating"> <link rel="prev" href="cogl-2.0-experimental-GType-Integration-API.html" title="GType Integration API"> <link rel="next" href="coglglossary.html" title="Glossaries"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-GLES-2.0-context.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -109,8 +109,8 @@ <a name="cogl-2.0-experimental-GLES-2.0-context.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -711,8 +711,8 @@ mentioned in the release notes for the affected release. <td class="enum_member_name"><p><a name="COGL-GLES2-CONTEXT-ERROR-UNSUPPORTED:CAPS"></a>COGL_GLES2_CONTEXT_ERROR_UNSUPPORTED</p></td> <td class="enum_member_description"> <p>Creating GLES2 contexts - isn't supported. Applications should use <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#cogl-has-feature" title="cogl_has_feature ()"><code class="function">cogl_has_feature()</code></a> to - check for the <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-GLES2-CONTEXT:CAPS"><code class="literal">COGL_FEATURE_ID_GLES2_CONTEXT</code></a>.</p> +isn't supported. Applications should use <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#cogl-has-feature" title="cogl_has_feature ()"><code class="function">cogl_has_feature()</code></a> to +check for the <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-GLES2-CONTEXT:CAPS"><code class="literal">COGL_FEATURE_ID_GLES2_CONTEXT</code></a>.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -720,7 +720,7 @@ mentioned in the release notes for the affected release. <td class="enum_member_name"><p><a name="COGL-GLES2-CONTEXT-ERROR-DRIVER:CAPS"></a>COGL_GLES2_CONTEXT_ERROR_DRIVER</p></td> <td class="enum_member_description"> <p>An underlying driver error - occured.</p> +occured.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -731,6 +731,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GPU-synchronisation-fences.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GPU-synchronisation-fences.html index 52fc5235..c725b56d 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GPU-synchronisation-fences.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GPU-synchronisation-fences.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-utilities.html" title="Utilities"> <link rel="prev" href="cogl-2.0-experimental-Quaternions-(Rotations).html" title="Quaternions (Rotations)"> <link rel="next" href="cogl-2.0-experimental-Versioning-utility-macros.html" title="Versioning utility macros"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-GPU-synchronisation-fences.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -78,8 +78,8 @@ <a name="cogl-2.0-experimental-GPU-synchronisation-fences.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -311,6 +311,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GType-Integration-API.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GType-Integration-API.html index 3a8aacb6..a1ec2cfb 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GType-Integration-API.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-GType-Integration-API.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-integration.html" title="Binding and Integrating"> <link rel="prev" href="cogl-2.0-experimental-Main-loop-integration.html" title="Main loop integration"> <link rel="next" href="cogl-2.0-experimental-GLES-2.0-context.html" title="GLES 2.0 context"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-GType-Integration-API.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody><tr> <td class="function_type"> @@ -69,11 +69,8 @@ can be used for example to define GObject properties that accept a </div> </div> </div> -<div class="refsect1"> -<a name="cogl-2.0-experimental-GType-Integration-API.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-High-Level-Meta-Textures.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-High-Level-Meta-Textures.html index 3fc4b35d..5d84aa64 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-High-Level-Meta-Textures.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-High-Level-Meta-Textures.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-meta-textures.html" title="Meta Textures"> <link rel="prev" href="cogl-meta-textures.html" title="Meta Textures"> <link rel="next" href="cogl-2.0-experimental-Sub-Textures.html" title="Sub Textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,8 +28,8 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-High-Level-Meta-Textures.top_of_page"></a>High Level Meta Textures</span></h2> <p>High Level Meta Textures — Interface for high-level textures built from - low-level textures like <a class="link" href="cogl-2.0-experimental-2D-textures.html#CoglTexture2D" title="CoglTexture2D"><span class="type">CoglTexture2D</span></a> and - <a class="link" href="cogl-2.0-experimental-3D-textures.html#CoglTexture3D" title="CoglTexture3D"><span class="type">CoglTexture3D</span></a>.</p> +low-level textures like <a class="link" href="cogl-2.0-experimental-2D-textures.html#CoglTexture2D" title="CoglTexture2D"><span class="type">CoglTexture2D</span></a> and +<a class="link" href="cogl-2.0-experimental-3D-textures.html#CoglTexture3D" title="CoglTexture3D"><span class="type">CoglTexture3D</span></a>.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -37,8 +37,8 @@ <a name="cogl-2.0-experimental-High-Level-Meta-Textures.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -64,8 +64,8 @@ <a name="cogl-2.0-experimental-High-Level-Meta-Textures.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="typedef_keyword">typedef</td> @@ -314,6 +314,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Indices.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Indices.html index e4f19cfe..ae16044b 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Indices.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Indices.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-buffer-layout-apis.html" title="Describing the layout of GPU Memory"> <link rel="prev" href="cogl-2.0-experimental-Vertex-Attributes.html" title="Vertex Attributes"> <link rel="next" href="cogl-primitive-apis.html" title="Geometry"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-Indices.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -70,8 +70,8 @@ <a name="cogl-2.0-experimental-Indices.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -117,14 +117,14 @@ vertices multiple times.</p> 6 7 8</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglVertex2f</span><span class="normal"> quad_vertices</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span><span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal">x0</span><span class="symbol">,</span><span class="normal"> y0</span><span class="cbracket">}</span><span class="symbol">,</span><span class="normal"> </span><span class="comment">//0 = top left</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal">x1</span><span class="symbol">,</span><span class="normal"> y1</span><span class="cbracket">}</span><span class="symbol">,</span><span class="normal"> </span><span class="comment">//1 = bottom left</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal">x2</span><span class="symbol">,</span><span class="normal"> y2</span><span class="cbracket">}</span><span class="symbol">,</span><span class="normal"> </span><span class="comment">//2 = bottom right</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal">x3</span><span class="symbol">,</span><span class="normal"> y3</span><span class="cbracket">}</span><span class="symbol">,</span><span class="normal"> </span><span class="comment">//3 = top right</span> -<span class="cbracket">}</span><span class="symbol">;</span> -<span class="comment">//tell the gpu how to interpret the quad as 2 triangles...</span> -<span class="type">unsigned</span><span class="normal"> </span><span class="type">char</span><span class="normal"> indices</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span><span class="normal"> </span><span class="cbracket">{</span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">,</span><span class="normal"> </span><span class="number">2</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">2</span><span class="symbol">,</span><span class="normal"> </span><span class="number">3</span><span class="cbracket">}</span><span class="symbol">;</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglVertex2f</span> <span class="n">quad_vertices</span><span class="p">[]</span> <span class="o">=</span> <span class="p">{</span> + <span class="p">{</span><span class="n">x0</span><span class="p">,</span> <span class="n">y0</span><span class="p">},</span> <span class="c1">//0 = top left</span> + <span class="p">{</span><span class="n">x1</span><span class="p">,</span> <span class="n">y1</span><span class="p">},</span> <span class="c1">//1 = bottom left</span> + <span class="p">{</span><span class="n">x2</span><span class="p">,</span> <span class="n">y2</span><span class="p">},</span> <span class="c1">//2 = bottom right</span> + <span class="p">{</span><span class="n">x3</span><span class="p">,</span> <span class="n">y3</span><span class="p">},</span> <span class="c1">//3 = top right</span> +<span class="p">};</span> +<span class="c1">//tell the gpu how to interpret the quad as 2 triangles...</span> +<span class="kt">unsigned</span> <span class="kt">char</span> <span class="n">indices</span><span class="p">[]</span> <span class="o">=</span> <span class="p">{</span><span class="mi">0</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">2</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">2</span><span class="p">,</span> <span class="mi">3</span><span class="p">};</span></pre></td> </tr> </tbody> </table> @@ -263,6 +263,6 @@ advertized.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Low-level-primitive-textures.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Low-level-primitive-textures.html index 34249790..c9a7c8d7 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Low-level-primitive-textures.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Low-level-primitive-textures.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-primitive-textures.html" title="Primitive Textures"> <link rel="prev" href="cogl-primitive-textures.html" title="Primitive Textures"> <link rel="next" href="cogl-2.0-experimental-2D-textures.html" title="2D textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Low-level-primitive-textures.top_of_page"></a>Low-level primitive textures</span></h2> <p>Low-level primitive textures — Interface for low-level textures like - <a class="link" href="cogl-2.0-experimental-2D-textures.html#CoglTexture2D" title="CoglTexture2D"><span class="type">CoglTexture2D</span></a> and <a class="link" href="cogl-2.0-experimental-3D-textures.html#CoglTexture3D" title="CoglTexture3D"><span class="type">CoglTexture3D</span></a>.</p> +<a class="link" href="cogl-2.0-experimental-2D-textures.html#CoglTexture2D" title="CoglTexture2D"><span class="type">CoglTexture2D</span></a> and <a class="link" href="cogl-2.0-experimental-3D-textures.html#CoglTexture3D" title="CoglTexture3D"><span class="type">CoglTexture3D</span></a>.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Low-level-primitive-textures.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -63,8 +63,8 @@ <a name="cogl-2.0-experimental-Low-level-primitive-textures.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="typedef_keyword">typedef</td> @@ -195,6 +195,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Main-loop-integration.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Main-loop-integration.html index 01d659fa..3a5e0494 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Main-loop-integration.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Main-loop-integration.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-integration.html" title="Binding and Integrating"> <link rel="prev" href="cogl-2.0-experimental-SDL-Integration.html" title="SDL Integration"> <link rel="next" href="cogl-2.0-experimental-GType-Integration-API.html" title="GType Integration API"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Main-loop-integration.top_of_page"></a>Main loop integration</span></h2> <p>Main loop integration — Functions for integrating Cogl with an - application's main loop</p> +application's main loop</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Main-loop-integration.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -79,8 +79,8 @@ <a name="cogl-2.0-experimental-Main-loop-integration.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -433,7 +433,7 @@ may be directly passed to poll.</p> <td class="enum_member_name"><p><a name="COGL-POLL-FD-EVENT-HUP:CAPS"></a>COGL_POLL_FD_EVENT_HUP</p></td> <td class="enum_member_description"> <p>hung up (the connection has been broken, usually - for pipes and sockets).</p> +for pipes and sockets).</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -528,6 +528,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrices.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrices.html index 827ccb72..96bbf043 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrices.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrices.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-utilities.html" title="Utilities"> <link rel="prev" href="cogl-2.0-experimental-Color-Type.html" title="Color Type"> <link rel="next" href="cogl-2.0-experimental-Matrix-Stacks.html" title="Matrix Stacks"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-Matrices.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -245,8 +245,8 @@ <a name="cogl-2.0-experimental-Matrices.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">Â </td> @@ -275,10 +275,10 @@ cogl_matrix_init_identity (<em class="parameter"><code><a class="link" href="cog 2 3 4</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol">.</span><span class="normal">xx</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">xy</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">xz</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">xw</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span> -<span class="symbol">.</span><span class="normal">yx</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">yy</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">yz</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">yw</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span> -<span class="symbol">.</span><span class="normal">zx</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">zy</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">zz</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">zw</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span> -<span class="symbol">.</span><span class="normal">wx</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">wy</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">wz</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">ww</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">.</span><span class="n">xx</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span> <span class="p">.</span><span class="n">xy</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">xz</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">xw</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> +<span class="p">.</span><span class="n">yx</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">yy</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span> <span class="p">.</span><span class="n">yz</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">yw</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> +<span class="p">.</span><span class="n">zx</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">zy</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">zz</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span> <span class="p">.</span><span class="n">zw</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> +<span class="p">.</span><span class="n">wx</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">wy</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">wz</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">ww</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span></pre></td> </tr> </tbody> </table> @@ -350,10 +350,10 @@ cogl_matrix_init_translation (<em class="parameter"><code><a class="link" href=" 2 3 4</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol">.</span><span class="normal">xx</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">xy</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">xz</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">xw</span><span class="symbol">=</span><span class="normal">tx</span><span class="symbol">;</span> -<span class="symbol">.</span><span class="normal">yx</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">yy</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">yz</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">yw</span><span class="symbol">=</span><span class="normal">ty</span><span class="symbol">;</span> -<span class="symbol">.</span><span class="normal">zx</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">zy</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">zz</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">zw</span><span class="symbol">=</span><span class="normal">tz</span><span class="symbol">;</span> -<span class="symbol">.</span><span class="normal">wx</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">wy</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">wz</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">ww</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">.</span><span class="n">xx</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span> <span class="p">.</span><span class="n">xy</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">xz</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">xw</span><span class="o">=</span><span class="n">tx</span><span class="p">;</span> +<span class="p">.</span><span class="n">yx</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">yy</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span> <span class="p">.</span><span class="n">yz</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">yw</span><span class="o">=</span><span class="n">ty</span><span class="p">;</span> +<span class="p">.</span><span class="n">zx</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">zy</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">zz</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span> <span class="p">.</span><span class="n">zw</span><span class="o">=</span><span class="n">tz</span><span class="p">;</span> +<span class="p">.</span><span class="n">wx</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">wy</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">wz</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">ww</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span></pre></td> </tr> </tbody> </table> @@ -1300,29 +1300,29 @@ transform in-place.</p> 21 22 23</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">typedef</span><span class="normal"> </span><span class="keyword">struct</span><span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal">y</span><span class="symbol">;</span> -<span class="normal"> </span><span class="usertype">uint8_t</span><span class="normal"> r</span><span class="symbol">,</span><span class="normal">g</span><span class="symbol">,</span><span class="normal">b</span><span class="symbol">,</span><span class="normal">a</span><span class="symbol">;</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> s</span><span class="symbol">,</span><span class="normal">t</span><span class="symbol">,</span><span class="normal">p</span><span class="symbol">;</span> -<span class="cbracket">}</span><span class="normal"> MyInVertex</span><span class="symbol">;</span> -<span class="keyword">typedef</span><span class="normal"> </span><span class="keyword">struct</span><span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="usertype">uint8_t</span><span class="normal"> r</span><span class="symbol">,</span><span class="normal">g</span><span class="symbol">,</span><span class="normal">b</span><span class="symbol">,</span><span class="normal">a</span><span class="symbol">;</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal">y</span><span class="symbol">,</span><span class="normal">z</span><span class="symbol">;</span> -<span class="cbracket">}</span><span class="normal"> MyOutVertex</span><span class="symbol">;</span> -<span class="usertype">MyInVertex</span><span class="normal"> vertices</span><span class="symbol">[</span><span class="normal">N_VERTICES</span><span class="symbol">];</span> -<span class="usertype">MyOutVertex</span><span class="normal"> results</span><span class="symbol">[</span><span class="normal">N_VERTICES</span><span class="symbol">];</span> -<span class="usertype">CoglMatrix</span><span class="normal"> matrix</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="k">typedef</span> <span class="k">struct</span> <span class="p">{</span> + <span class="kt">float</span> <span class="n">x</span><span class="p">,</span><span class="n">y</span><span class="p">;</span> + <span class="kt">uint8_t</span> <span class="n">r</span><span class="p">,</span><span class="n">g</span><span class="p">,</span><span class="n">b</span><span class="p">,</span><span class="n">a</span><span class="p">;</span> + <span class="kt">float</span> <span class="n">s</span><span class="p">,</span><span class="n">t</span><span class="p">,</span><span class="n">p</span><span class="p">;</span> +<span class="p">}</span> <span class="n">MyInVertex</span><span class="p">;</span> +<span class="k">typedef</span> <span class="k">struct</span> <span class="p">{</span> + <span class="kt">uint8_t</span> <span class="n">r</span><span class="p">,</span><span class="n">g</span><span class="p">,</span><span class="n">b</span><span class="p">,</span><span class="n">a</span><span class="p">;</span> + <span class="kt">float</span> <span class="n">x</span><span class="p">,</span><span class="n">y</span><span class="p">,</span><span class="n">z</span><span class="p">;</span> +<span class="p">}</span> <span class="n">MyOutVertex</span><span class="p">;</span> +<span class="n">MyInVertex</span> <span class="n">vertices</span><span class="p">[</span><span class="n">N_VERTICES</span><span class="p">];</span> +<span class="n">MyOutVertex</span> <span class="n">results</span><span class="p">[</span><span class="n">N_VERTICES</span><span class="p">];</span> +<span class="n">CoglMatrix</span> <span class="n">matrix</span><span class="p">;</span> -<span class="function">my_load_vertices</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">vertices</span><span class="symbol">);</span> -<span class="function">my_get_matrix</span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">matrix</span><span class="symbol">);</span> +<span class="n">my_load_vertices</span> <span class="p">(</span><span class="n">vertices</span><span class="p">);</span> +<span class="n">my_get_matrix</span> <span class="p">(</span><span class="o">&</span><span class="n">matrix</span><span class="p">);</span> -<span class="function"><a href="cogl-2.0-experimental-Matrices.html#cogl-matrix-transform-points">cogl_matrix_transform_points</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">matrix</span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">2</span><span class="symbol">,</span> -<span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyInVertex</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">vertices</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">].</span><span class="normal">x</span><span class="symbol">,</span> -<span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyOutVertex</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">results</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">].</span><span class="normal">x</span><span class="symbol">,</span> -<span class="normal"> N_VERTICES</span><span class="symbol">);</span></pre></td> +<span class="n">cogl_matrix_transform_points</span> <span class="p">(</span><span class="o">&</span><span class="n">matrix</span><span class="p">,</span> + <span class="mi">2</span><span class="p">,</span> + <span class="k">sizeof</span> <span class="p">(</span><span class="n">MyInVertex</span><span class="p">),</span> + <span class="o">&</span><span class="n">vertices</span><span class="p">[</span><span class="mi">0</span><span class="p">].</span><span class="n">x</span><span class="p">,</span> + <span class="k">sizeof</span> <span class="p">(</span><span class="n">MyOutVertex</span><span class="p">),</span> + <span class="o">&</span><span class="n">results</span><span class="p">[</span><span class="mi">0</span><span class="p">].</span><span class="n">x</span><span class="p">,</span> + <span class="n">N_VERTICES</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -1436,29 +1436,29 @@ the input array to do the transform in-place.</p> 21 22 23</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">typedef</span><span class="normal"> </span><span class="keyword">struct</span><span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal">y</span><span class="symbol">;</span> -<span class="normal"> </span><span class="usertype">uint8_t</span><span class="normal"> r</span><span class="symbol">,</span><span class="normal">g</span><span class="symbol">,</span><span class="normal">b</span><span class="symbol">,</span><span class="normal">a</span><span class="symbol">;</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> s</span><span class="symbol">,</span><span class="normal">t</span><span class="symbol">,</span><span class="normal">p</span><span class="symbol">;</span> -<span class="cbracket">}</span><span class="normal"> MyInVertex</span><span class="symbol">;</span> -<span class="keyword">typedef</span><span class="normal"> </span><span class="keyword">struct</span><span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="usertype">uint8_t</span><span class="normal"> r</span><span class="symbol">,</span><span class="normal">g</span><span class="symbol">,</span><span class="normal">b</span><span class="symbol">,</span><span class="normal">a</span><span class="symbol">;</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal">y</span><span class="symbol">,</span><span class="normal">z</span><span class="symbol">;</span> -<span class="cbracket">}</span><span class="normal"> MyOutVertex</span><span class="symbol">;</span> -<span class="usertype">MyInVertex</span><span class="normal"> vertices</span><span class="symbol">[</span><span class="normal">N_VERTICES</span><span class="symbol">];</span> -<span class="usertype">MyOutVertex</span><span class="normal"> results</span><span class="symbol">[</span><span class="normal">N_VERTICES</span><span class="symbol">];</span> -<span class="usertype">CoglMatrix</span><span class="normal"> matrix</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="k">typedef</span> <span class="k">struct</span> <span class="p">{</span> + <span class="kt">float</span> <span class="n">x</span><span class="p">,</span><span class="n">y</span><span class="p">;</span> + <span class="kt">uint8_t</span> <span class="n">r</span><span class="p">,</span><span class="n">g</span><span class="p">,</span><span class="n">b</span><span class="p">,</span><span class="n">a</span><span class="p">;</span> + <span class="kt">float</span> <span class="n">s</span><span class="p">,</span><span class="n">t</span><span class="p">,</span><span class="n">p</span><span class="p">;</span> +<span class="p">}</span> <span class="n">MyInVertex</span><span class="p">;</span> +<span class="k">typedef</span> <span class="k">struct</span> <span class="p">{</span> + <span class="kt">uint8_t</span> <span class="n">r</span><span class="p">,</span><span class="n">g</span><span class="p">,</span><span class="n">b</span><span class="p">,</span><span class="n">a</span><span class="p">;</span> + <span class="kt">float</span> <span class="n">x</span><span class="p">,</span><span class="n">y</span><span class="p">,</span><span class="n">z</span><span class="p">;</span> +<span class="p">}</span> <span class="n">MyOutVertex</span><span class="p">;</span> +<span class="n">MyInVertex</span> <span class="n">vertices</span><span class="p">[</span><span class="n">N_VERTICES</span><span class="p">];</span> +<span class="n">MyOutVertex</span> <span class="n">results</span><span class="p">[</span><span class="n">N_VERTICES</span><span class="p">];</span> +<span class="n">CoglMatrix</span> <span class="n">matrix</span><span class="p">;</span> -<span class="function">my_load_vertices</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">vertices</span><span class="symbol">);</span> -<span class="function">my_get_matrix</span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">matrix</span><span class="symbol">);</span> +<span class="n">my_load_vertices</span> <span class="p">(</span><span class="n">vertices</span><span class="p">);</span> +<span class="n">my_get_matrix</span> <span class="p">(</span><span class="o">&</span><span class="n">matrix</span><span class="p">);</span> -<span class="function"><a href="cogl-2.0-experimental-Matrices.html#cogl-matrix-project-points">cogl_matrix_project_points</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">matrix</span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">2</span><span class="symbol">,</span> -<span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyInVertex</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">vertices</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">].</span><span class="normal">x</span><span class="symbol">,</span> -<span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyOutVertex</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">results</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">].</span><span class="normal">x</span><span class="symbol">,</span> -<span class="normal"> N_VERTICES</span><span class="symbol">);</span></pre></td> +<span class="n">cogl_matrix_project_points</span> <span class="p">(</span><span class="o">&</span><span class="n">matrix</span><span class="p">,</span> + <span class="mi">2</span><span class="p">,</span> + <span class="k">sizeof</span> <span class="p">(</span><span class="n">MyInVertex</span><span class="p">),</span> + <span class="o">&</span><span class="n">vertices</span><span class="p">[</span><span class="mi">0</span><span class="p">].</span><span class="n">x</span><span class="p">,</span> + <span class="k">sizeof</span> <span class="p">(</span><span class="n">MyOutVertex</span><span class="p">),</span> + <span class="o">&</span><span class="n">results</span><span class="p">[</span><span class="mi">0</span><span class="p">].</span><span class="n">x</span><span class="p">,</span> + <span class="n">N_VERTICES</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -1602,10 +1602,10 @@ applied.</p> 2 3 4</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">x_new </span><span class="symbol">=</span><span class="normal"> xx </span><span class="symbol">*</span><span class="normal"> x </span><span class="symbol">+</span><span class="normal"> xy </span><span class="symbol">*</span><span class="normal"> y </span><span class="symbol">+</span><span class="normal"> xz </span><span class="symbol">*</span><span class="normal"> z </span><span class="symbol">+</span><span class="normal"> xw </span><span class="symbol">*</span><span class="normal"> w</span> -<span class="normal">y_new </span><span class="symbol">=</span><span class="normal"> yx </span><span class="symbol">*</span><span class="normal"> x </span><span class="symbol">+</span><span class="normal"> yy </span><span class="symbol">*</span><span class="normal"> y </span><span class="symbol">+</span><span class="normal"> yz </span><span class="symbol">*</span><span class="normal"> z </span><span class="symbol">+</span><span class="normal"> yw </span><span class="symbol">*</span><span class="normal"> w</span> -<span class="normal">z_new </span><span class="symbol">=</span><span class="normal"> zx </span><span class="symbol">*</span><span class="normal"> x </span><span class="symbol">+</span><span class="normal"> zy </span><span class="symbol">*</span><span class="normal"> y </span><span class="symbol">+</span><span class="normal"> zz </span><span class="symbol">*</span><span class="normal"> z </span><span class="symbol">+</span><span class="normal"> zw </span><span class="symbol">*</span><span class="normal"> w</span> -<span class="normal">w_new </span><span class="symbol">=</span><span class="normal"> wx </span><span class="symbol">*</span><span class="normal"> x </span><span class="symbol">+</span><span class="normal"> wy </span><span class="symbol">*</span><span class="normal"> y </span><span class="symbol">+</span><span class="normal"> wz </span><span class="symbol">*</span><span class="normal"> z </span><span class="symbol">+</span><span class="normal"> ww </span><span class="symbol">*</span><span class="normal"> w</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">x_new</span> <span class="o">=</span> <span class="n">xx</span> <span class="o">*</span> <span class="n">x</span> <span class="o">+</span> <span class="n">xy</span> <span class="o">*</span> <span class="n">y</span> <span class="o">+</span> <span class="n">xz</span> <span class="o">*</span> <span class="n">z</span> <span class="o">+</span> <span class="n">xw</span> <span class="o">*</span> <span class="n">w</span> +<span class="n">y_new</span> <span class="o">=</span> <span class="n">yx</span> <span class="o">*</span> <span class="n">x</span> <span class="o">+</span> <span class="n">yy</span> <span class="o">*</span> <span class="n">y</span> <span class="o">+</span> <span class="n">yz</span> <span class="o">*</span> <span class="n">z</span> <span class="o">+</span> <span class="n">yw</span> <span class="o">*</span> <span class="n">w</span> +<span class="n">z_new</span> <span class="o">=</span> <span class="n">zx</span> <span class="o">*</span> <span class="n">x</span> <span class="o">+</span> <span class="n">zy</span> <span class="o">*</span> <span class="n">y</span> <span class="o">+</span> <span class="n">zz</span> <span class="o">*</span> <span class="n">z</span> <span class="o">+</span> <span class="n">zw</span> <span class="o">*</span> <span class="n">w</span> +<span class="n">w_new</span> <span class="o">=</span> <span class="n">wx</span> <span class="o">*</span> <span class="n">x</span> <span class="o">+</span> <span class="n">wy</span> <span class="o">*</span> <span class="n">y</span> <span class="o">+</span> <span class="n">wz</span> <span class="o">*</span> <span class="n">z</span> <span class="o">+</span> <span class="n">ww</span> <span class="o">*</span> <span class="n">w</span></pre></td> </tr> </tbody> </table> @@ -1622,6 +1622,6 @@ than the identity matrix you can use <a class="link" href="cogl-2.0-experimental </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrix-Stacks.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrix-Stacks.html index 58fc41b5..6a757905 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrix-Stacks.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Matrix-Stacks.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-utilities.html" title="Utilities"> <link rel="prev" href="cogl-2.0-experimental-Matrices.html" title="Matrices"> <link rel="next" href="cogl-2.0-experimental-3-Component-Vectors.html" title="3 Component Vectors"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Matrix-Stacks.top_of_page"></a>Matrix Stacks</span></h2> <p>Matrix Stacks — Functions for efficiently tracking many - related transformations</p> +related transformations</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Matrix-Stacks.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -231,8 +231,8 @@ <a name="cogl-2.0-experimental-Matrix-Stacks.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -1306,6 +1306,6 @@ don't matter anyway so this enables extremely cheap comparisons.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Offscreen-Framebuffers.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Offscreen-Framebuffers.html index 53b0a437..1fe0aeb9 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Offscreen-Framebuffers.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Offscreen-Framebuffers.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-framebuffer-apis.html" title="Framebuffers"> <link rel="prev" href="cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface"> <link rel="next" href="cogl-utilities.html" title="Utilities"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Offscreen-Framebuffers.top_of_page"></a>Offscreen Framebuffers</span></h2> <p>Offscreen Framebuffers — Functions for creating and manipulating offscreen - framebuffers.</p> +framebuffers.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Offscreen-Framebuffers.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -63,8 +63,8 @@ <a name="cogl-2.0-experimental-Offscreen-Framebuffers.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword"> </td> @@ -167,6 +167,6 @@ framebuffer. </p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Path-Primitives.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Path-Primitives.html index b8631cbc..c536f657 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Path-Primitives.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Path-Primitives.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-primitive-apis.html" title="Geometry"> <link rel="prev" href="cogl-2.0-experimental-Primitives.html" title="Primitives"> <link rel="next" href="cogl-2.0-experimental-Rectangles.html" title="Rectangles"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -38,11 +38,8 @@ <a name="cogl-2.0-experimental-Path-Primitives.functions_details"></a><h2>Functions</h2> <p></p> </div> -<div class="refsect1"> -<a name="cogl-2.0-experimental-Path-Primitives.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Pipeline.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Pipeline.html index d59b75bf..dd87d7f0 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Pipeline.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Pipeline.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-pipeline-apis.html" title="Setting Up A GPU Pipeline"> <link rel="prev" href="cogl-Blend-Strings.html" title="Blend Strings"> <link rel="next" href="cogl-2.0-experimental-Depth-State.html" title="Depth State"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Pipeline.top_of_page"></a>Pipeline</span></h2> <p>Pipeline — Functions for creating and manipulating the GPU - pipeline</p> +pipeline</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Pipeline.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -511,8 +511,8 @@ <a name="cogl-2.0-experimental-Pipeline.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -1511,7 +1511,7 @@ blend statements will be of the form:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol"><</span><span class="normal">channel</span><span class="symbol">-</span><span class="normal">mask</span><span class="symbol">>=</span><span class="function">ADD</span><span class="symbol">(</span><span class="normal">SRC_COLOR</span><span class="symbol">*(<</span><span class="normal">factor</span><span class="symbol">>),</span><span class="normal"> DST_COLOR</span><span class="symbol">*(<</span><span class="normal">factor</span><span class="symbol">>))</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="o"><</span><span class="n">channel</span><span class="o">-</span><span class="n">mask</span><span class="o">>=</span><span class="n">ADD</span><span class="p">(</span><span class="n">SRC_COLOR</span><span class="o">*</span><span class="p">(</span><span class="o"><</span><span class="n">factor</span><span class="o">></span><span class="p">),</span> <span class="n">DST_COLOR</span><span class="o">*</span><span class="p">(</span><span class="o"><</span><span class="n">factor</span><span class="o">></span><span class="p">))</span></pre></td> </tr> </tbody> </table> @@ -1563,7 +1563,7 @@ before computing the result of blending.</div> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">RGBA </span><span class="symbol">=</span><span class="normal"> </span><span class="function">ADD</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SRC_COLOR</span><span class="symbol">,</span><span class="normal"> DST_COLOR</span><span class="symbol">*(</span><span class="number">1</span><span class="symbol">-</span><span class="normal">SRC_COLOR</span><span class="symbol">[</span><span class="normal">A</span><span class="symbol">]))</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">RGBA</span> <span class="o">=</span> <span class="n">ADD</span> <span class="p">(</span><span class="n">SRC_COLOR</span><span class="p">,</span> <span class="n">DST_COLOR</span><span class="o">*</span><span class="p">(</span><span class="mi">1</span><span class="o">-</span><span class="n">SRC_COLOR</span><span class="p">[</span><span class="n">A</span><span class="p">]))</span></pre></td> </tr> </tbody> </table> @@ -2744,7 +2744,7 @@ are:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">RGBA </span><span class="symbol">=</span><span class="normal"> </span><span class="function">MODULATE</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">PREVIOUS</span><span class="symbol">,</span><span class="normal"> TEXTURE</span><span class="symbol">)</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">RGBA</span> <span class="o">=</span> <span class="n">MODULATE</span> <span class="p">(</span><span class="n">PREVIOUS</span><span class="p">,</span> <span class="n">TEXTURE</span><span class="p">)</span></pre></td> </tr> </tbody> </table> @@ -2759,7 +2759,7 @@ are:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">RGBA </span><span class="symbol">=</span><span class="normal"> </span><span class="function">INTERPOLATE</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">PREVIOUS</span><span class="symbol">,</span><span class="normal"> TEXTURE</span><span class="symbol">,</span><span class="normal"> CONSTANT</span><span class="symbol">[</span><span class="normal">A</span><span class="symbol">])</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">RGBA</span> <span class="o">=</span> <span class="n">INTERPOLATE</span> <span class="p">(</span><span class="n">PREVIOUS</span><span class="p">,</span> <span class="n">TEXTURE</span><span class="p">,</span> <span class="n">CONSTANT</span><span class="p">[</span><span class="n">A</span><span class="p">])</span></pre></td> </tr> </tbody> </table> @@ -3820,7 +3820,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-ALPHA-FUNC-LESS:CAPS"></a>COGL_PIPELINE_ALPHA_FUNC_LESS</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value is less than the reference alpha value</p> +alpha value is less than the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3828,7 +3828,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-ALPHA-FUNC-EQUAL:CAPS"></a>COGL_PIPELINE_ALPHA_FUNC_EQUAL</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value equals the reference alpha value</p> +alpha value equals the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3836,7 +3836,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-ALPHA-FUNC-LEQUAL:CAPS"></a>COGL_PIPELINE_ALPHA_FUNC_LEQUAL</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value is less than or equal to the reference alpha value</p> +alpha value is less than or equal to the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3844,7 +3844,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-ALPHA-FUNC-GREATER:CAPS"></a>COGL_PIPELINE_ALPHA_FUNC_GREATER</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value is greater than the reference alpha value</p> +alpha value is greater than the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3852,7 +3852,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-ALPHA-FUNC-NOTEQUAL:CAPS"></a>COGL_PIPELINE_ALPHA_FUNC_NOTEQUAL</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value does not equal the reference alpha value</p> +alpha value does not equal the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3860,7 +3860,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-ALPHA-FUNC-GEQUAL:CAPS"></a>COGL_PIPELINE_ALPHA_FUNC_GEQUAL</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value is greater than or equal to the reference alpha value.</p> +alpha value is greater than or equal to the reference alpha value.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3921,7 +3921,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-BLEND-STRING-ERROR-GPU-UNSUPPORTED-ERROR:CAPS"></a>COGL_BLEND_STRING_ERROR_GPU_UNSUPPORTED_ERROR</p></td> <td class="enum_member_description"> <p>Blend string not - supported by the GPU</p> +supported by the GPU</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3948,7 +3948,7 @@ pipeline using <a class="link" href="cogl-2.0-experimental-Pipeline.html#cogl-pi <td class="enum_member_name"><p><a name="COGL-PIPELINE-CULL-FACE-MODE-NONE:CAPS"></a>COGL_PIPELINE_CULL_FACE_MODE_NONE</p></td> <td class="enum_member_description"> <p>Neither face will be - culled. This is the default.</p> +culled. This is the default.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4031,7 +4031,7 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-FILTER-NEAREST:CAPS"></a>COGL_PIPELINE_FILTER_NEAREST</p></td> <td class="enum_member_description"> <p>Measuring in manhatten distance from the, - current pixel center, use the nearest texture texel</p> +current pixel center, use the nearest texture texel</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4039,7 +4039,7 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-FILTER-LINEAR:CAPS"></a>COGL_PIPELINE_FILTER_LINEAR</p></td> <td class="enum_member_description"> <p>Use the weighted average of the 4 texels - nearest the current pixel center</p> +nearest the current pixel center</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4047,8 +4047,8 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-FILTER-NEAREST-MIPMAP-NEAREST:CAPS"></a>COGL_PIPELINE_FILTER_NEAREST_MIPMAP_NEAREST</p></td> <td class="enum_member_description"> <p>Select the mimap level whose - texel size most closely matches the current pixel, and use the - <a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-FILTER-NEAREST:CAPS"><code class="literal">COGL_PIPELINE_FILTER_NEAREST</code></a> criterion</p> +texel size most closely matches the current pixel, and use the +<a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-FILTER-NEAREST:CAPS"><code class="literal">COGL_PIPELINE_FILTER_NEAREST</code></a> criterion</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4056,8 +4056,8 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-FILTER-LINEAR-MIPMAP-NEAREST:CAPS"></a>COGL_PIPELINE_FILTER_LINEAR_MIPMAP_NEAREST</p></td> <td class="enum_member_description"> <p>Select the mimap level whose - texel size most closely matches the current pixel, and use the - <a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-FILTER-LINEAR:CAPS"><code class="literal">COGL_PIPELINE_FILTER_LINEAR</code></a> criterion</p> +texel size most closely matches the current pixel, and use the +<a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-FILTER-LINEAR:CAPS"><code class="literal">COGL_PIPELINE_FILTER_LINEAR</code></a> criterion</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4065,9 +4065,9 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-FILTER-NEAREST-MIPMAP-LINEAR:CAPS"></a>COGL_PIPELINE_FILTER_NEAREST_MIPMAP_LINEAR</p></td> <td class="enum_member_description"> <p>Select the two mimap levels - whose texel size most closely matches the current pixel, use - the <a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-FILTER-NEAREST:CAPS"><code class="literal">COGL_PIPELINE_FILTER_NEAREST</code></a> criterion on each one and take - their weighted average</p> +whose texel size most closely matches the current pixel, use +the <a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-FILTER-NEAREST:CAPS"><code class="literal">COGL_PIPELINE_FILTER_NEAREST</code></a> criterion on each one and take +their weighted average</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4075,9 +4075,9 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-FILTER-LINEAR-MIPMAP-LINEAR:CAPS"></a>COGL_PIPELINE_FILTER_LINEAR_MIPMAP_LINEAR</p></td> <td class="enum_member_description"> <p>Select the two mimap levels - whose texel size most closely matches the current pixel, use - the <a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-FILTER-LINEAR:CAPS"><code class="literal">COGL_PIPELINE_FILTER_LINEAR</code></a> criterion on each one and take - their weighted average</p> +whose texel size most closely matches the current pixel, use +the <a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-FILTER-LINEAR:CAPS"><code class="literal">COGL_PIPELINE_FILTER_LINEAR</code></a> criterion on each one and take +their weighted average</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4109,7 +4109,7 @@ merged in if the wrap mode is set to repeat.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-WRAP-MODE-REPEAT:CAPS"></a>COGL_PIPELINE_WRAP_MODE_REPEAT</p></td> <td class="enum_member_description"> <p>The texture will be repeated. This - is useful for example to draw a tiled background.</p> +is useful for example to draw a tiled background.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4122,9 +4122,9 @@ merged in if the wrap mode is set to repeat.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-WRAP-MODE-CLAMP-TO-EDGE:CAPS"></a>COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE</p></td> <td class="enum_member_description"> <p>The coordinates outside the - range 0→1 will sample copies of the edge pixels of the - texture. This is useful to avoid artifacts if only one copy of - the texture is being rendered.</p> +range 0→1 will sample copies of the edge pixels of the +texture. This is useful to avoid artifacts if only one copy of +the texture is being rendered.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4132,13 +4132,13 @@ merged in if the wrap mode is set to repeat.</p> <td class="enum_member_name"><p><a name="COGL-PIPELINE-WRAP-MODE-AUTOMATIC:CAPS"></a>COGL_PIPELINE_WRAP_MODE_AUTOMATIC</p></td> <td class="enum_member_description"> <p>Cogl will try to automatically - decide which of the above two to use. For <a class="link" href="cogl-2.0-experimental-Rectangles.html#cogl-rectangle" title="cogl_rectangle ()"><code class="function">cogl_rectangle()</code></a>, it - will use repeat mode if any of the texture coordinates are - outside the range 0→1, otherwise it will use clamp to edge. For - <code class="function">cogl_polygon()</code> it will always use repeat mode. For - <code class="function">cogl_vertex_buffer_draw()</code> it will use repeat mode except for - layers that have point sprite coordinate generation enabled. This - is the default value.</p> +decide which of the above two to use. For <a class="link" href="cogl-2.0-experimental-Rectangles.html#cogl-rectangle" title="cogl_rectangle ()"><code class="function">cogl_rectangle()</code></a>, it +will use repeat mode if any of the texture coordinates are +outside the range 0→1, otherwise it will use clamp to edge. For +<code class="function">cogl_polygon()</code> it will always use repeat mode. For +<code class="function">cogl_vertex_buffer_draw()</code> it will use repeat mode except for +layers that have point sprite coordinate generation enabled. This +is the default value.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -4150,6 +4150,6 @@ merged in if the wrap mode is set to repeat.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Primitives.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Primitives.html index 569bafda..43a1dc4e 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Primitives.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Primitives.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-primitive-apis.html" title="Geometry"> <link rel="prev" href="cogl-primitive-apis.html" title="Geometry"> <link rel="next" href="cogl-2.0-experimental-Path-Primitives.html" title="Path Primitives"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Primitives.top_of_page"></a>Primitives</span></h2> <p>Primitives — Functions for creating, manipulating and drawing - primitives</p> +primitives</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Primitives.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -239,8 +239,8 @@ <a name="cogl-2.0-experimental-Primitives.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword"> </td> @@ -413,15 +413,15 @@ attribute with a <a class="link" href="cogl-2.0-experimental-Vertex-Attributes.h 7 8 9</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglVertexP2</span><span class="normal"> triangle</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">150</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="normal"> </span><span class="cbracket">}</span> -<span class="cbracket">}</span><span class="symbol">;</span> -<span class="normal">prim </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-new-p2">cogl_primitive_new_p2</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="cogl-2.0-experimental-Common-Types.html#COGL-VERTICES-MODE-TRIANGLE-FAN:CAPS">COGL_VERTICES_MODE_TRIANGLE_FAN</a></span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> triangle</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-draw">cogl_primitive_draw</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">prim</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglVertexP2</span> <span class="n">triangle</span><span class="p">[]</span> <span class="o">=</span> +<span class="p">{</span> + <span class="p">{</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">300</span> <span class="p">},</span> + <span class="p">{</span> <span class="mi">150</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="p">},</span> + <span class="p">{</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">300</span> <span class="p">}</span> +<span class="p">};</span> +<span class="n">prim</span> <span class="o">=</span> <span class="n">cogl_primitive_new_p2</span> <span class="p">(</span><span class="n">COGL_VERTICES_MODE_TRIANGLE_FAN</span><span class="p">,</span> + <span class="mi">3</span><span class="p">,</span> <span class="n">triangle</span><span class="p">);</span> +<span class="n">cogl_primitive_draw</span> <span class="p">(</span><span class="n">prim</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -526,15 +526,15 @@ attribute with a <a class="link" href="cogl-2.0-experimental-Vertex-Attributes.h 7 8 9</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglVertexP3</span><span class="normal"> triangle</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">150</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="normal"> </span><span class="cbracket">}</span> -<span class="cbracket">}</span><span class="symbol">;</span> -<span class="normal">prim </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-new-p3">cogl_primitive_new_p3</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="cogl-2.0-experimental-Common-Types.html#COGL-VERTICES-MODE-TRIANGLE-FAN:CAPS">COGL_VERTICES_MODE_TRIANGLE_FAN</a></span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> triangle</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-draw">cogl_primitive_draw</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">prim</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglVertexP3</span> <span class="n">triangle</span><span class="p">[]</span> <span class="o">=</span> +<span class="p">{</span> + <span class="p">{</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">0</span> <span class="p">},</span> + <span class="p">{</span> <span class="mi">150</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span> <span class="p">},</span> + <span class="p">{</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">0</span> <span class="p">}</span> +<span class="p">};</span> +<span class="n">prim</span> <span class="o">=</span> <span class="n">cogl_primitive_new_p3</span> <span class="p">(</span><span class="n">COGL_VERTICES_MODE_TRIANGLE_FAN</span><span class="p">,</span> + <span class="mi">3</span><span class="p">,</span> <span class="n">triangle</span><span class="p">);</span> +<span class="n">cogl_primitive_draw</span> <span class="p">(</span><span class="n">prim</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -641,15 +641,15 @@ can do:</p> 7 8 9</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglVertexP2C4</span><span class="normal"> triangle</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">150</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="normal"> </span><span class="cbracket">}</span> -<span class="cbracket">}</span><span class="symbol">;</span> -<span class="normal">prim </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-new-p2c4">cogl_primitive_new_p2c4</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="cogl-2.0-experimental-Common-Types.html#COGL-VERTICES-MODE-TRIANGLE-FAN:CAPS">COGL_VERTICES_MODE_TRIANGLE_FAN</a></span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> triangle</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-draw">cogl_primitive_draw</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">prim</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglVertexP2C4</span> <span class="n">triangle</span><span class="p">[]</span> <span class="o">=</span> +<span class="p">{</span> + <span class="p">{</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span> <span class="p">},</span> + <span class="p">{</span> <span class="mi">150</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span> <span class="p">},</span> + <span class="p">{</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span> <span class="p">}</span> +<span class="p">};</span> +<span class="n">prim</span> <span class="o">=</span> <span class="n">cogl_primitive_new_p2c4</span> <span class="p">(</span><span class="n">COGL_VERTICES_MODE_TRIANGLE_FAN</span><span class="p">,</span> + <span class="mi">3</span><span class="p">,</span> <span class="n">triangle</span><span class="p">);</span> +<span class="n">cogl_primitive_draw</span> <span class="p">(</span><span class="n">prim</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -756,15 +756,15 @@ can do:</p> 7 8 9</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglVertexP3C4</span><span class="normal"> triangle</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">150</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="normal"> </span><span class="cbracket">}</span> -<span class="cbracket">}</span><span class="symbol">;</span> -<span class="normal">prim </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-new-p3c4">cogl_primitive_new_p3c4</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="cogl-2.0-experimental-Common-Types.html#COGL-VERTICES-MODE-TRIANGLE-FAN:CAPS">COGL_VERTICES_MODE_TRIANGLE_FAN</a></span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> triangle</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-draw">cogl_primitive_draw</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">prim</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglVertexP3C4</span> <span class="n">triangle</span><span class="p">[]</span> <span class="o">=</span> +<span class="p">{</span> + <span class="p">{</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span> <span class="p">},</span> + <span class="p">{</span> <span class="mi">150</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span> <span class="p">},</span> + <span class="p">{</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span> <span class="p">}</span> +<span class="p">};</span> +<span class="n">prim</span> <span class="o">=</span> <span class="n">cogl_primitive_new_p3c4</span> <span class="p">(</span><span class="n">COGL_VERTICES_MODE_TRIANGLE_FAN</span><span class="p">,</span> + <span class="mi">3</span><span class="p">,</span> <span class="n">triangle</span><span class="p">);</span> +<span class="n">cogl_primitive_draw</span> <span class="p">(</span><span class="n">prim</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -871,15 +871,15 @@ do:</p> 7 8 9</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglVertexP2T2</span><span class="normal"> triangle</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">150</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.5</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.0</span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="cbracket">}</span> -<span class="cbracket">}</span><span class="symbol">;</span> -<span class="normal">prim </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-new-p2t2">cogl_primitive_new_p2t2</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="cogl-2.0-experimental-Common-Types.html#COGL-VERTICES-MODE-TRIANGLE-FAN:CAPS">COGL_VERTICES_MODE_TRIANGLE_FAN</a></span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> triangle</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-draw">cogl_primitive_draw</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">prim</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglVertexP2T2</span> <span class="n">triangle</span><span class="p">[]</span> <span class="o">=</span> +<span class="p">{</span> + <span class="p">{</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">},</span> + <span class="p">{</span> <span class="mi">150</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mf">0.5</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">},</span> + <span class="p">{</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">}</span> +<span class="p">};</span> +<span class="n">prim</span> <span class="o">=</span> <span class="n">cogl_primitive_new_p2t2</span> <span class="p">(</span><span class="n">COGL_VERTICES_MODE_TRIANGLE_FAN</span><span class="p">,</span> + <span class="mi">3</span><span class="p">,</span> <span class="n">triangle</span><span class="p">);</span> +<span class="n">cogl_primitive_draw</span> <span class="p">(</span><span class="n">prim</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -986,15 +986,15 @@ do:</p> 7 8 9</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglVertexP3T2</span><span class="normal"> triangle</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">150</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.5</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.0</span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="cbracket">}</span> -<span class="cbracket">}</span><span class="symbol">;</span> -<span class="normal">prim </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-new-p3t2">cogl_primitive_new_p3t2</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="cogl-2.0-experimental-Common-Types.html#COGL-VERTICES-MODE-TRIANGLE-FAN:CAPS">COGL_VERTICES_MODE_TRIANGLE_FAN</a></span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> triangle</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-draw">cogl_primitive_draw</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">prim</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglVertexP3T2</span> <span class="n">triangle</span><span class="p">[]</span> <span class="o">=</span> +<span class="p">{</span> + <span class="p">{</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">},</span> + <span class="p">{</span> <span class="mi">150</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mf">0.5</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">},</span> + <span class="p">{</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">}</span> +<span class="p">};</span> +<span class="n">prim</span> <span class="o">=</span> <span class="n">cogl_primitive_new_p3t2</span> <span class="p">(</span><span class="n">COGL_VERTICES_MODE_TRIANGLE_FAN</span><span class="p">,</span> + <span class="mi">3</span><span class="p">,</span> <span class="n">triangle</span><span class="p">);</span> +<span class="n">cogl_primitive_draw</span> <span class="p">(</span><span class="n">prim</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -1101,15 +1101,15 @@ linear gradient you can do:</p> 7 8 9</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglVertexP2T2C4</span><span class="normal"> triangle</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">150</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.5</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="cbracket">}</span> -<span class="cbracket">}</span><span class="symbol">;</span> -<span class="normal">prim </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-new-p2t2c4">cogl_primitive_new_p2t2c4</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="cogl-2.0-experimental-Common-Types.html#COGL-VERTICES-MODE-TRIANGLE-FAN:CAPS">COGL_VERTICES_MODE_TRIANGLE_FAN</a></span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> triangle</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-draw">cogl_primitive_draw</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">prim</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglVertexP2T2C4</span> <span class="n">triangle</span><span class="p">[]</span> <span class="o">=</span> +<span class="p">{</span> + <span class="p">{</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">},</span> + <span class="p">{</span> <span class="mi">150</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mf">0.5</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">},</span> + <span class="p">{</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">}</span> +<span class="p">};</span> +<span class="n">prim</span> <span class="o">=</span> <span class="n">cogl_primitive_new_p2t2c4</span> <span class="p">(</span><span class="n">COGL_VERTICES_MODE_TRIANGLE_FAN</span><span class="p">,</span> + <span class="mi">3</span><span class="p">,</span> <span class="n">triangle</span><span class="p">);</span> +<span class="n">cogl_primitive_draw</span> <span class="p">(</span><span class="n">prim</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -1216,15 +1216,15 @@ linear gradient you can do:</p> 7 8 9</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglVertexP3T2C4</span><span class="normal"> triangle</span><span class="symbol">[]</span><span class="normal"> </span><span class="symbol">=</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">150</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.5</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="cbracket">}</span><span class="symbol">,</span> -<span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">300</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="cbracket">}</span> -<span class="cbracket">}</span><span class="symbol">;</span> -<span class="normal">prim </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-new-p3t2c4">cogl_primitive_new_p3t2c4</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="cogl-2.0-experimental-Common-Types.html#COGL-VERTICES-MODE-TRIANGLE-FAN:CAPS">COGL_VERTICES_MODE_TRIANGLE_FAN</a></span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> triangle</span><span class="symbol">);</span> -<span class="function"><a href="cogl-2.0-experimental-Primitives.html#cogl-primitive-draw">cogl_primitive_draw</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">prim</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglVertexP3T2C4</span> <span class="n">triangle</span><span class="p">[]</span> <span class="o">=</span> +<span class="p">{</span> + <span class="p">{</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">},</span> + <span class="p">{</span> <span class="mi">150</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mf">0.5</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">},</span> + <span class="p">{</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">300</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">}</span> +<span class="p">};</span> +<span class="n">prim</span> <span class="o">=</span> <span class="n">cogl_primitive_new_p3t2c4</span> <span class="p">(</span><span class="n">COGL_VERTICES_MODE_TRIANGLE_FAN</span><span class="p">,</span> + <span class="mi">3</span><span class="p">,</span> <span class="n">triangle</span><span class="p">);</span> +<span class="n">cogl_primitive_draw</span> <span class="p">(</span><span class="n">prim</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -1860,6 +1860,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Quaternions-(Rotations).html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Quaternions-(Rotations).html index 090e8057..f74280aa 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Quaternions-(Rotations).html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Quaternions-(Rotations).html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-utilities.html" title="Utilities"> <link rel="prev" href="cogl-2.0-experimental-Eulers-(Rotations).html" title="Eulers (Rotations)"> <link rel="next" href="cogl-2.0-experimental-GPU-synchronisation-fences.html" title="GPU synchronisation fences"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -36,8 +36,8 @@ quaternions.</p> <a name="cogl-2.0-experimental-Quaternions-(Rotations).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -237,8 +237,8 @@ quaternions.</p> <a name="cogl-2.0-experimental-Quaternions-(Rotations).other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword"> </td> @@ -1127,7 +1127,7 @@ pair are represented in a quaternion as follows:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol">[</span><span class="normal">w</span><span class="symbol">=</span><span class="function">cos</span><span class="symbol">(</span><span class="normal">ðœƒ</span><span class="symbol">/</span><span class="number">2</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"> x</span><span class="symbol">=</span><span class="function">sin</span><span class="symbol">(</span><span class="normal">ðœƒ</span><span class="symbol">/</span><span class="number">2</span><span class="symbol">)*</span><span class="normal">a</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">=</span><span class="function">sin</span><span class="symbol">(</span><span class="normal">ðœƒ</span><span class="symbol">/</span><span class="number">2</span><span class="symbol">)*</span><span class="normal">a</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">,</span><span class="normal"> z</span><span class="symbol">=</span><span class="function">sin</span><span class="symbol">(</span><span class="normal">ðœƒ</span><span class="symbol">/</span><span class="number">2</span><span class="symbol">)*</span><span class="normal">a</span><span class="symbol">.</span><span class="normal">x </span><span class="symbol">)]</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">[</span><span class="n">w</span><span class="o">=</span><span class="n">cos</span><span class="p">(</span><span class="err">ðœƒ</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span> <span class="p">(</span> <span class="n">x</span><span class="o">=</span><span class="n">sin</span><span class="p">(</span><span class="err">ðœƒ</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span><span class="o">*</span><span class="n">a</span><span class="p">.</span><span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="o">=</span><span class="n">sin</span><span class="p">(</span><span class="err">ðœƒ</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span><span class="o">*</span><span class="n">a</span><span class="p">.</span><span class="n">y</span><span class="p">,</span> <span class="n">z</span><span class="o">=</span><span class="n">sin</span><span class="p">(</span><span class="err">ðœƒ</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span><span class="o">*</span><span class="n">a</span><span class="p">.</span><span class="n">x</span> <span class="p">)]</span></pre></td> </tr> </tbody> </table> @@ -1143,7 +1143,7 @@ magnitude of a quaternion is defined as:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function">sqrt</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">w² </span><span class="symbol">+</span><span class="normal"> x² </span><span class="symbol">+</span><span class="normal"> y² </span><span class="symbol">+</span><span class="normal"> z²</span><span class="symbol">)</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">sqrt</span> <span class="p">(</span><span class="n">w²</span> <span class="o">+</span> <span class="n">x²</span> <span class="o">+</span> <span class="n">y²</span> <span class="o">+</span> <span class="n">z²</span><span class="p">)</span></pre></td> </tr> </tbody> </table> @@ -1156,7 +1156,7 @@ and a unit quaternion satisfies this equation:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">w² </span><span class="symbol">+</span><span class="normal"> x² </span><span class="symbol">+</span><span class="normal"> y² </span><span class="symbol">+</span><span class="normal"> z² </span><span class="symbol">=</span><span class="normal"> </span><span class="number">1</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">w²</span> <span class="o">+</span> <span class="n">x²</span> <span class="o">+</span> <span class="n">y²</span> <span class="o">+</span> <span class="n">z²</span> <span class="o">=</span> <span class="mi">1</span></pre></td> </tr> </tbody> </table> @@ -1216,6 +1216,6 @@ rotation it is sin(ðœƒ/2)*axis.z</p></td> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html index f5a2cefd..4524534d 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-primitive-textures.html" title="Primitive Textures"> <link rel="prev" href="cogl-2.0-experimental-3D-textures.html" title="3D textures"> <link rel="next" href="cogl-framebuffer-apis.html" title="Framebuffers"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).top_of_page"></a>Rectangle textures (non-normalized coordinates)</span></h2> <p>Rectangle textures (non-normalized coordinates) — Functions for creating and manipulating rectangle - textures for use with non-normalized coordinates.</p> +textures for use with non-normalized coordinates.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -71,8 +71,8 @@ <a name="cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword"> </td> @@ -279,6 +279,6 @@ cogl_is_texture_rectangle (<em class="parameter"><code><span class="type">void</ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangles.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangles.html index 6f764f4b..011cd4ac 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangles.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Rectangles.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-primitive-apis.html" title="Geometry"> <link rel="prev" href="cogl-2.0-experimental-Path-Primitives.html" title="Path Primitives"> <link rel="next" href="cogl-textures.html" title="Textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-Rectangles.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -351,11 +351,8 @@ and one group of texture coordinates, this would be 4)</p></td> <p class="since">Since: <a class="link" href="ix04.html#api-index-1.0">1.0</a></p> </div> </div> -<div class="refsect1"> -<a name="cogl-2.0-experimental-Rectangles.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-SDL-Integration.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-SDL-Integration.html index df078679..1760d654 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-SDL-Integration.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-SDL-Integration.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-integration.html" title="Binding and Integrating"> <link rel="prev" href="cogl-integration.html" title="Binding and Integrating"> <link rel="next" href="cogl-2.0-experimental-Main-loop-integration.html" title="Main loop integration"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-SDL-Integration.top_of_page"></a>SDL Integration</span></h2> <p>SDL Integration — Integration api for the Simple DirectMedia - Layer library.</p> +Layer library.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-SDL-Integration.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -140,43 +140,43 @@ this:</p> 35 36 37</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">MyAppData</span><span class="normal"> data</span><span class="symbol">;</span> -<span class="usertype">CoglError</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">error </span><span class="symbol">=</span><span class="normal"> NULL</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="n">MyAppData</span> <span class="n">data</span><span class="p">;</span> +<span class="n">CoglError</span> <span class="o">*</span><span class="n">error</span> <span class="o">=</span> <span class="nb">NULL</span><span class="p">;</span> -<span class="normal">data</span><span class="symbol">.</span><span class="normal">ctx </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-SDL-Integration.html#cogl-sdl-context-new">cogl_sdl_context_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SDL_USEREVENT</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">error</span><span class="symbol">);</span> -<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="normal">data</span><span class="symbol">.</span><span class="normal">ctx</span><span class="symbol">)</span> -<span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="function">fprintf</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stderr</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Failed to create context: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span> -<span class="normal"> error</span><span class="symbol">-></span><span class="normal">message</span><span class="symbol">);</span> -<span class="normal"> </span><span class="keyword">return</span><span class="normal"> </span><span class="number">1</span><span class="symbol">;</span> -<span class="normal"> </span><span class="cbracket">}</span> +<span class="n">data</span><span class="p">.</span><span class="n">ctx</span> <span class="o">=</span> <span class="n">cogl_sdl_context_new</span> <span class="p">(</span><span class="n">SDL_USEREVENT</span><span class="p">,</span> <span class="o">&</span><span class="n">error</span><span class="p">);</span> +<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">data</span><span class="p">.</span><span class="n">ctx</span><span class="p">)</span> + <span class="p">{</span> + <span class="n">fprintf</span> <span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"Failed to create context: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> + <span class="n">error</span><span class="o">-></span><span class="n">message</span><span class="p">);</span> + <span class="k">return</span> <span class="mi">1</span><span class="p">;</span> + <span class="p">}</span> -<span class="function">my_application_setup</span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">data</span><span class="symbol">);</span> +<span class="n">my_application_setup</span> <span class="p">(</span><span class="o">&</span><span class="n">data</span><span class="p">);</span> -<span class="normal">data</span><span class="symbol">.</span><span class="normal">redraw_queued </span><span class="symbol">=</span><span class="normal"> TRUE</span><span class="symbol">;</span> -<span class="keyword">while</span><span class="normal"> </span><span class="symbol">(!</span><span class="normal">data</span><span class="symbol">.</span><span class="normal">quit</span><span class="symbol">)</span> -<span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="keyword">while</span><span class="normal"> </span><span class="symbol">(!</span><span class="normal">data</span><span class="symbol">.</span><span class="normal">quit</span><span class="symbol">)</span> -<span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="function">SDL_PollEvent</span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">event</span><span class="symbol">))</span> -<span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">.</span><span class="normal">redraw_queued</span><span class="symbol">)</span> -<span class="normal"> </span><span class="keyword">break</span><span class="symbol">;</span> +<span class="n">data</span><span class="p">.</span><span class="n">redraw_queued</span> <span class="o">=</span> <span class="n">TRUE</span><span class="p">;</span> +<span class="k">while</span> <span class="p">(</span><span class="o">!</span><span class="n">data</span><span class="p">.</span><span class="n">quit</span><span class="p">)</span> + <span class="p">{</span> + <span class="k">while</span> <span class="p">(</span><span class="o">!</span><span class="n">data</span><span class="p">.</span><span class="n">quit</span><span class="p">)</span> + <span class="p">{</span> + <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">SDL_PollEvent</span> <span class="p">(</span><span class="o">&</span><span class="n">event</span><span class="p">))</span> + <span class="p">{</span> + <span class="k">if</span> <span class="p">(</span><span class="n">data</span><span class="p">.</span><span class="n">redraw_queued</span><span class="p">)</span> + <span class="k">break</span><span class="p">;</span> -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-SDL-Integration.html#cogl-sdl-idle">cogl_sdl_idle</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">ctx</span><span class="symbol">);</span> -<span class="normal"> </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="function">SDL_WaitEvent</span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">event</span><span class="symbol">))</span> -<span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="function">fprintf</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stderr</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Error waiting for SDL events"</span><span class="symbol">);</span> -<span class="normal"> </span><span class="keyword">return</span><span class="normal"> </span><span class="number">1</span><span class="symbol">;</span> -<span class="normal"> </span><span class="cbracket">}</span> -<span class="normal"> </span><span class="cbracket">}</span> + <span class="n">cogl_sdl_idle</span> <span class="p">(</span><span class="n">ctx</span><span class="p">);</span> + <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">SDL_WaitEvent</span> <span class="p">(</span><span class="o">&</span><span class="n">event</span><span class="p">))</span> + <span class="p">{</span> + <span class="n">fprintf</span> <span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"Error waiting for SDL events"</span><span class="p">);</span> + <span class="k">return</span> <span class="mi">1</span><span class="p">;</span> + <span class="p">}</span> + <span class="p">}</span> -<span class="normal"> </span><span class="function">handle_event</span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">data</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">event</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-SDL-Integration.html#cogl-sdl-handle-event">cogl_sdl_handle_event</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">ctx</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">event</span><span class="symbol">);</span> -<span class="normal"> </span><span class="cbracket">}</span> + <span class="n">handle_event</span> <span class="p">(</span><span class="o">&</span><span class="n">data</span><span class="p">,</span> <span class="o">&</span><span class="n">event</span><span class="p">);</span> + <span class="n">cogl_sdl_handle_event</span> <span class="p">(</span><span class="n">ctx</span><span class="p">,</span> <span class="o">&</span><span class="n">event</span><span class="p">);</span> + <span class="p">}</span> -<span class="normal"> data</span><span class="symbol">.</span><span class="normal">redraw_queued </span><span class="symbol">=</span><span class="normal"> </span><span class="function">redraw</span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">data</span><span class="symbol">);</span> -<span class="normal"> </span><span class="cbracket">}</span></pre></td> + <span class="n">data</span><span class="p">.</span><span class="n">redraw_queued</span> <span class="o">=</span> <span class="n">redraw</span> <span class="p">(</span><span class="o">&</span><span class="n">data</span><span class="p">);</span> + <span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -214,21 +214,21 @@ as a way to interrupt <code class="function">SDL_WaitEvent()</code>.</p> 13 14 15</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglRenderer</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">renderer </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html#cogl-renderer-new">cogl_renderer_new</a></span><span class="normal"> </span><span class="symbol">();</span> -<span class="usertype">CoglDisplay</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">display</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglRenderer</span> <span class="o">*</span><span class="n">renderer</span> <span class="o">=</span> <span class="n">cogl_renderer_new</span> <span class="p">();</span> +<span class="n">CoglDisplay</span> <span class="o">*</span><span class="n">display</span><span class="p">;</span> -<span class="function"><a href="cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html#cogl-renderer-set-winsys-id">cogl_renderer_set_winsys_id</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">renderer</span><span class="symbol">,</span><span class="normal"> <a href="cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html#COGL-WINSYS-ID-SDL:CAPS">COGL_WINSYS_ID_SDL</a></span><span class="symbol">);</span> +<span class="n">cogl_renderer_set_winsys_id</span> <span class="p">(</span><span class="n">renderer</span><span class="p">,</span> <span class="n">COGL_WINSYS_ID_SDL</span><span class="p">);</span> -<span class="function"><a href="cogl-2.0-experimental-SDL-Integration.html#cogl-sdl-renderer-set-event-type">cogl_sdl_renderer_set_event_type</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">renderer</span><span class="symbol">,</span><span class="normal"> type</span><span class="symbol">);</span> +<span class="n">cogl_sdl_renderer_set_event_type</span> <span class="p">(</span><span class="n">renderer</span><span class="p">,</span> <span class="n">type</span><span class="p">);</span> -<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="function"><a href="cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html#cogl-renderer-connect">cogl_renderer_connect</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">renderer</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">))</span> -<span class="normal"> </span><span class="keyword">return</span><span class="normal"> NULL</span><span class="symbol">;</span> +<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">cogl_renderer_connect</span> <span class="p">(</span><span class="n">renderer</span><span class="p">,</span> <span class="n">error</span><span class="p">))</span> + <span class="k">return</span> <span class="nb">NULL</span><span class="p">;</span> -<span class="normal">display </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html#cogl-display-new">cogl_display_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">renderer</span><span class="symbol">,</span><span class="normal"> NULL</span><span class="symbol">);</span> -<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="function"><a href="cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html#cogl-display-setup">cogl_display_setup</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">display</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">))</span> -<span class="normal"> </span><span class="keyword">return</span><span class="normal"> NULL</span><span class="symbol">;</span> +<span class="n">display</span> <span class="o">=</span> <span class="n">cogl_display_new</span> <span class="p">(</span><span class="n">renderer</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> +<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">cogl_display_setup</span> <span class="p">(</span><span class="n">display</span><span class="p">,</span> <span class="n">error</span><span class="p">))</span> + <span class="k">return</span> <span class="nb">NULL</span><span class="p">;</span> -<span class="keyword">return</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-The-Top-Level-Context.html#cogl-context-new">cogl_context_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">display</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">);</span></pre></td> +<span class="k">return</span> <span class="nf">cogl_context_new</span> <span class="p">(</span><span class="n">display</span><span class="p">,</span> <span class="n">error</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -501,11 +501,8 @@ mentioned in the release notes for the affected release. "><span class="acronym">Unstable</span></acronym></p> </div> </div> -<div class="refsect1"> -<a name="cogl-2.0-experimental-SDL-Integration.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Shader-snippets.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Shader-snippets.html index 28b6b017..30d5bd3f 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Shader-snippets.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Shader-snippets.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-pipeline-apis.html" title="Setting Up A GPU Pipeline"> <link rel="prev" href="cogl-2.0-experimental-Depth-State.html" title="Depth State"> <link rel="next" href="cogl-buffer-apis.html" title="Allocating GPU Memory"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-Shader-snippets.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -130,8 +130,8 @@ <a name="cogl-2.0-experimental-Shader-snippets.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -1169,7 +1169,7 @@ variable to alter the returned texel. <td class="enum_member_name"><p><a name="COGL-SNIPPET-HOOK-VERTEX:CAPS"></a>COGL_SNIPPET_HOOK_VERTEX</p></td> <td class="enum_member_description"> <p>A hook for the entire vertex processing - stage of the pipeline.</p> +stage of the pipeline.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1184,8 +1184,8 @@ variable to alter the returned texel. <td class="enum_member_name"><p><a name="COGL-SNIPPET-HOOK-VERTEX-GLOBALS:CAPS"></a>COGL_SNIPPET_HOOK_VERTEX_GLOBALS</p></td> <td class="enum_member_description"> <p>A hook for declaring global data - that can be shared with all other snippets that are on a vertex - hook.</p> +that can be shared with all other snippets that are on a vertex +hook.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1193,9 +1193,9 @@ variable to alter the returned texel. <td class="enum_member_name"><p><a name="COGL-SNIPPET-HOOK-POINT-SIZE:CAPS"></a>COGL_SNIPPET_HOOK_POINT_SIZE</p></td> <td class="enum_member_description"> <p>A hook for manipulating the point - size of a vertex. This is only used if - <a class="link" href="cogl-2.0-experimental-Pipeline.html#cogl-pipeline-set-per-vertex-point-size" title="cogl_pipeline_set_per_vertex_point_size ()"><code class="function">cogl_pipeline_set_per_vertex_point_size()</code></a> is enabled on the - pipeline.</p> +size of a vertex. This is only used if +<a class="link" href="cogl-2.0-experimental-Pipeline.html#cogl-pipeline-set-per-vertex-point-size" title="cogl_pipeline_set_per_vertex_point_size ()"><code class="function">cogl_pipeline_set_per_vertex_point_size()</code></a> is enabled on the +pipeline.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1203,7 +1203,7 @@ variable to alter the returned texel. <td class="enum_member_name"><p><a name="COGL-SNIPPET-HOOK-FRAGMENT:CAPS"></a>COGL_SNIPPET_HOOK_FRAGMENT</p></td> <td class="enum_member_description"> <p>A hook for the entire fragment - processing stage of the pipeline.</p> +processing stage of the pipeline.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1211,8 +1211,8 @@ variable to alter the returned texel. <td class="enum_member_name"><p><a name="COGL-SNIPPET-HOOK-FRAGMENT-GLOBALS:CAPS"></a>COGL_SNIPPET_HOOK_FRAGMENT_GLOBALS</p></td> <td class="enum_member_description"> <p>A hook for declaring global - data wthat can be shared with all other snippets that are on a - fragment hook.</p> +data wthat can be shared with all other snippets that are on a +fragment hook.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1220,7 +1220,7 @@ variable to alter the returned texel. <td class="enum_member_name"><p><a name="COGL-SNIPPET-HOOK-TEXTURE-COORD-TRANSFORM:CAPS"></a>COGL_SNIPPET_HOOK_TEXTURE_COORD_TRANSFORM</p></td> <td class="enum_member_description"> <p>A hook for applying the - layer matrix to a texture coordinate for a layer.</p> +layer matrix to a texture coordinate for a layer.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1228,7 +1228,7 @@ variable to alter the returned texel. <td class="enum_member_name"><p><a name="COGL-SNIPPET-HOOK-LAYER-FRAGMENT:CAPS"></a>COGL_SNIPPET_HOOK_LAYER_FRAGMENT</p></td> <td class="enum_member_description"> <p>A hook for the fragment - processing of a particular layer.</p> +processing of a particular layer.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1236,7 +1236,7 @@ variable to alter the returned texel. <td class="enum_member_name"><p><a name="COGL-SNIPPET-HOOK-TEXTURE-LOOKUP:CAPS"></a>COGL_SNIPPET_HOOK_TEXTURE_LOOKUP</p></td> <td class="enum_member_description"> <p>A hook for the texture lookup - stage of a given layer in a pipeline.</p> +stage of a given layer in a pipeline.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1262,6 +1262,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sliced-Textures.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sliced-Textures.html index 9edb9bbf..c6c963e7 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sliced-Textures.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sliced-Textures.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-meta-textures.html" title="Meta Textures"> <link rel="prev" href="cogl-2.0-experimental-Sub-Textures.html" title="Sub Textures"> <link rel="next" href="cogl-2.0-experimental-X11-Texture-From-Pixmap.html" title="X11 Texture From Pixmap"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,8 +28,8 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Sliced-Textures.top_of_page"></a>Sliced Textures</span></h2> <p>Sliced Textures — Functions for creating and manipulating 2D meta - textures that may internally be comprised of - multiple 2D textures with power-of-two sizes.</p> +textures that may internally be comprised of +multiple 2D textures with power-of-two sizes.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -37,8 +37,8 @@ <a name="cogl-2.0-experimental-Sliced-Textures.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -88,8 +88,8 @@ <a name="cogl-2.0-experimental-Sliced-Textures.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword"> </td> @@ -518,6 +518,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sub-Textures.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sub-Textures.html index ff0dd651..ddd94545 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sub-Textures.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Sub-Textures.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-meta-textures.html" title="Meta Textures"> <link rel="prev" href="cogl-2.0-experimental-High-Level-Meta-Textures.html" title="High Level Meta Textures"> <link rel="next" href="cogl-2.0-experimental-Sliced-Textures.html" title="Sliced Textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Sub-Textures.top_of_page"></a>Sub Textures</span></h2> <p>Sub Textures — Functions for creating and manipulating - sub-textures.</p> +sub-textures.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Sub-Textures.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -63,8 +63,8 @@ <a name="cogl-2.0-experimental-Sub-Textures.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword"> </td> @@ -223,6 +223,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Object-Interface.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Object-Interface.html index 98d9d809..4fb6e4fd 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Object-Interface.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Object-Interface.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-general-apis.html" title="General API concepts"> <link rel="prev" href="cogl-general-apis.html" title="General API concepts"> <link rel="next" href="cogl-2.0-experimental-Exception-handling.html" title="Exception handling"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-The-Object-Interface.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -78,8 +78,8 @@ <a name="cogl-2.0-experimental-The-Object-Interface.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -301,22 +301,22 @@ on an object something like this:</p> 14 15 16</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="usertype">CoglUserDataKey</span><span class="normal"> path_private_key</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="k">static</span> <span class="n">CoglUserDataKey</span> <span class="n">path_private_key</span><span class="p">;</span> -<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span> -<span class="function">destroy_path_private_cb</span><span class="normal"> </span><span class="symbol">(</span><span class="type">void</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">data</span><span class="symbol">)</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="function">g_free</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">);</span> -<span class="cbracket">}</span> +<span class="k">static</span> <span class="kt">void</span> +<span class="nf">destroy_path_private_cb</span> <span class="p">(</span><span class="kt">void</span> <span class="o">*</span><span class="n">data</span><span class="p">)</span> +<span class="p">{</span> + <span class="n">g_free</span> <span class="p">(</span><span class="n">data</span><span class="p">);</span> +<span class="p">}</span> -<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span> -<span class="function">my_path_set_data</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">CoglPath</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">path</span><span class="symbol">,</span><span class="normal"> </span><span class="type">void</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">data</span><span class="symbol">)</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-The-Object-Interface.html#cogl-object-set-user-data">cogl_object_set_user_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">COGL_OBJECT</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">path</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">private_key</span><span class="symbol">,</span> -<span class="normal"> data</span><span class="symbol">,</span> -<span class="normal"> destroy_path_private_cb</span><span class="symbol">);</span> -<span class="cbracket">}</span></pre></td> +<span class="k">static</span> <span class="kt">void</span> +<span class="nf">my_path_set_data</span> <span class="p">(</span><span class="n">CoglPath</span> <span class="o">*</span><span class="n">path</span><span class="p">,</span> <span class="kt">void</span> <span class="o">*</span><span class="n">data</span><span class="p">)</span> +<span class="p">{</span> + <span class="n">cogl_object_set_user_data</span> <span class="p">(</span><span class="n">COGL_OBJECT</span> <span class="p">(</span><span class="n">path</span><span class="p">),</span> + <span class="o">&</span><span class="n">private_key</span><span class="p">,</span> + <span class="n">data</span><span class="p">,</span> + <span class="n">destroy_path_private_cb</span><span class="p">);</span> +<span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -354,6 +354,6 @@ same key.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Texture-Interface.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Texture-Interface.html index bb3a9bc2..bd0288a6 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Texture-Interface.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Texture-Interface.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-textures.html" title="Textures"> <link rel="prev" href="cogl-2.0-experimental-Bitmap.html" title="Bitmap"> <link rel="next" href="cogl-meta-textures.html" title="Meta Textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-The-Texture-Interface.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -140,8 +140,8 @@ <a name="cogl-2.0-experimental-The-Texture-Interface.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -419,7 +419,7 @@ something like this:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">next_width </span><span class="symbol">=</span><span class="normal"> </span><span class="function">MAX</span><span class="normal"> </span><span class="symbol">(</span><span class="number">1</span><span class="symbol">,</span><span class="normal"> </span><span class="function">floor</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">prev_width</span><span class="symbol">));</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">next_width</span> <span class="o">=</span> <span class="n">MAX</span> <span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">floor</span> <span class="p">(</span><span class="n">prev_width</span><span class="p">));</span></pre></td> </tr> </tbody> </table> @@ -433,7 +433,7 @@ like this:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">n_levels </span><span class="symbol">=</span><span class="normal"> </span><span class="number">1</span><span class="normal"> </span><span class="symbol">+</span><span class="normal"> </span><span class="function">floor</span><span class="normal"> </span><span class="symbol">(</span><span class="function">log2</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">max_dimension</span><span class="symbol">));</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">n_levels</span> <span class="o">=</span> <span class="mi">1</span> <span class="o">+</span> <span class="n">floor</span> <span class="p">(</span><span class="n">log2</span> <span class="p">(</span><span class="n">max_dimension</span><span class="p">));</span></pre></td> </tr> </tbody> </table> @@ -822,7 +822,7 @@ mentioned in the release notes for the affected release. <td class="enum_member_name"><p><a name="COGL-TEXTURE-ERROR-TYPE:CAPS"></a>COGL_TEXTURE_ERROR_TYPE</p></td> <td class="enum_member_description"> <p>A primitive texture type that is - unsupported by the driver was used</p> +unsupported by the driver was used</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -923,8 +923,8 @@ mentioned in the release notes for the affected release. <td class="enum_member_name"><p><a name="COGL-TEXTURE-COMPONENTS-RG:CAPS"></a>COGL_TEXTURE_COMPONENTS_RG</p></td> <td class="enum_member_description"> <p>Red and green components. Note that - this can only be used if the <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-RG:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_RG</code></a> feature - is advertised.</p> +this can only be used if the <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-RG:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_RG</code></a> feature +is advertised.</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -957,6 +957,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Top-Level-Context.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Top-Level-Context.html index dde531df..1aed4049 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Top-Level-Context.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Top-Level-Context.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-context-apis.html" title="Setting Up A Drawing Context"> <link rel="prev" href="cogl-2.0-experimental-CoglDisplay---Setup-a-display-pipeline.html" title="CoglDisplay: Setup a display pipeline"> <link rel="next" href="cogl-pipeline-apis.html" title="Setting Up A GPU Pipeline"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-The-Top-Level-Context.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -310,8 +310,8 @@ <a name="cogl-2.0-experimental-The-Top-Level-Context.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -1737,11 +1737,11 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-TEXTURE-NPOT-BASIC:CAPS"></a>COGL_FEATURE_ID_TEXTURE_NPOT_BASIC</p></td> <td class="enum_member_description"> <p>The hardware supports non power - of two textures, but you also need to check the - <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-MIPMAP:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP</code></a> and <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-REPEAT:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_REPEAT</code></a> - features to know if the hardware supports npot texture mipmaps - or repeat modes other than - <a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-WRAP-MODE-CLAMP-TO-EDGE:CAPS"><code class="literal">COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE</code></a> respectively.</p> +of two textures, but you also need to check the +<a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-MIPMAP:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP</code></a> and <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-REPEAT:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_REPEAT</code></a> +features to know if the hardware supports npot texture mipmaps +or repeat modes other than +<a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-WRAP-MODE-CLAMP-TO-EDGE:CAPS"><code class="literal">COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE</code></a> respectively.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1749,7 +1749,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-TEXTURE-NPOT-MIPMAP:CAPS"></a>COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP</p></td> <td class="enum_member_description"> <p>Mipmapping is supported in - conjuntion with non power of two textures.</p> +conjuntion with non power of two textures.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1757,8 +1757,8 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-TEXTURE-NPOT-REPEAT:CAPS"></a>COGL_FEATURE_ID_TEXTURE_NPOT_REPEAT</p></td> <td class="enum_member_description"> <p>Repeat modes other than - <a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-WRAP-MODE-CLAMP-TO-EDGE:CAPS"><code class="literal">COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE</code></a> are supported by the - hardware.</p> +<a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-WRAP-MODE-CLAMP-TO-EDGE:CAPS"><code class="literal">COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE</code></a> are supported by the +hardware.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1766,9 +1766,9 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-TEXTURE-NPOT:CAPS"></a>COGL_FEATURE_ID_TEXTURE_NPOT</p></td> <td class="enum_member_description"> <p>Non power of two textures are supported - by the hardware. This is a equivalent to the - <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-BASIC:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_BASIC</code></a>, <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-MIPMAP:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP</code></a> - and <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-REPEAT:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_REPEAT</code></a> features combined.</p> +by the hardware. This is a equivalent to the +<a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-BASIC:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_BASIC</code></a>, <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-MIPMAP:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP</code></a> +and <a class="link" href="cogl-2.0-experimental-The-Top-Level-Context.html#COGL-FEATURE-ID-TEXTURE-NPOT-REPEAT:CAPS"><code class="literal">COGL_FEATURE_ID_TEXTURE_NPOT_REPEAT</code></a> features combined.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1776,7 +1776,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-TEXTURE-RECTANGLE:CAPS"></a>COGL_FEATURE_ID_TEXTURE_RECTANGLE</p></td> <td class="enum_member_description"> <p>Support for rectangular - textures with non-normalized texture coordinates.</p> +textures with non-normalized texture coordinates.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1812,7 +1812,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-OFFSCREEN-MULTISAMPLE:CAPS"></a>COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE</p></td> <td class="enum_member_description"> <p>Multisample support for - offscreen framebuffers</p> +offscreen framebuffers</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1820,7 +1820,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-ONSCREEN-MULTIPLE:CAPS"></a>COGL_FEATURE_ID_ONSCREEN_MULTIPLE</p></td> <td class="enum_member_description"> <p>Multiple onscreen framebuffers - supported.</p> +supported.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1828,8 +1828,8 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-UNSIGNED-INT-INDICES:CAPS"></a>COGL_FEATURE_ID_UNSIGNED_INT_INDICES</p></td> <td class="enum_member_description"> <p>Set if - <a class="link" href="cogl-2.0-experimental-Indices.html#COGL-INDICES-TYPE-UNSIGNED-INT:CAPS"><code class="literal">COGL_INDICES_TYPE_UNSIGNED_INT</code></a> is supported in - <a class="link" href="cogl-2.0-experimental-Indices.html#cogl-indices-new" title="cogl_indices_new ()"><code class="function">cogl_indices_new()</code></a>.</p> +<a class="link" href="cogl-2.0-experimental-Indices.html#COGL-INDICES-TYPE-UNSIGNED-INT:CAPS"><code class="literal">COGL_INDICES_TYPE_UNSIGNED_INT</code></a> is supported in +<a class="link" href="cogl-2.0-experimental-Indices.html#cogl-indices-new" title="cogl_indices_new ()"><code class="function">cogl_indices_new()</code></a>.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1844,7 +1844,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-POINT-SPRITE:CAPS"></a>COGL_FEATURE_ID_POINT_SPRITE</p></td> <td class="enum_member_description"> <p>Whether - <a class="link" href="cogl-2.0-experimental-Pipeline.html#cogl-pipeline-set-layer-point-sprite-coords-enabled" title="cogl_pipeline_set_layer_point_sprite_coords_enabled ()"><code class="function">cogl_pipeline_set_layer_point_sprite_coords_enabled()</code></a> is supported.</p> +<a class="link" href="cogl-2.0-experimental-Pipeline.html#cogl-pipeline-set-layer-point-sprite-coords-enabled" title="cogl_pipeline_set_layer_point_sprite_coords_enabled ()"><code class="function">cogl_pipeline_set_layer_point_sprite_coords_enabled()</code></a> is supported.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1852,7 +1852,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-MAP-BUFFER-FOR-READ:CAPS"></a>COGL_FEATURE_ID_MAP_BUFFER_FOR_READ</p></td> <td class="enum_member_description"> <p>Whether <a class="link" href="cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html#cogl-buffer-map" title="cogl_buffer_map ()"><code class="function">cogl_buffer_map()</code></a> is - supported with CoglBufferAccess including read support.</p> +supported with CoglBufferAccess including read support.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1860,7 +1860,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-MAP-BUFFER-FOR-WRITE:CAPS"></a>COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE</p></td> <td class="enum_member_description"> <p>Whether <a class="link" href="cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html#cogl-buffer-map" title="cogl_buffer_map ()"><code class="function">cogl_buffer_map()</code></a> is - supported with CoglBufferAccess including write support.</p> +supported with CoglBufferAccess including write support.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1868,15 +1868,15 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-MIRRORED-REPEAT:CAPS"></a>COGL_FEATURE_ID_MIRRORED_REPEAT</p></td> <td class="enum_member_description"> <p>Whether - <a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-WRAP-MODE-MIRRORED-REPEAT:CAPS"><code class="literal">COGL_PIPELINE_WRAP_MODE_MIRRORED_REPEAT</code></a> is supported.</p> +<a class="link" href="cogl-2.0-experimental-Pipeline.html#COGL-PIPELINE-WRAP-MODE-MIRRORED-REPEAT:CAPS"><code class="literal">COGL_PIPELINE_WRAP_MODE_MIRRORED_REPEAT</code></a> is supported.</p> </td> <td class="enum_member_annotations"> </td> </tr> <tr> <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-SWAP-BUFFERS-EVENT:CAPS"></a>COGL_FEATURE_ID_SWAP_BUFFERS_EVENT</p></td> <td class="enum_member_description"> -<p> Available if the window system supports reporting an event - for swap buffer completions.</p> +<p>Available if the window system supports reporting an event +for swap buffer completions.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1884,7 +1884,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-GLES2-CONTEXT:CAPS"></a>COGL_FEATURE_ID_GLES2_CONTEXT</p></td> <td class="enum_member_description"> <p>Whether creating new GLES2 contexts is - suported.</p> +suported.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1892,7 +1892,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-DEPTH-TEXTURE:CAPS"></a>COGL_FEATURE_ID_DEPTH_TEXTURE</p></td> <td class="enum_member_description"> <p>Whether <a class="link" href="cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html#CoglFramebuffer" title="CoglFramebuffer"><span class="type">CoglFramebuffer</span></a> support rendering - the depth buffer to a texture.</p> +the depth buffer to a texture.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1900,7 +1900,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-PRESENTATION-TIME:CAPS"></a>COGL_FEATURE_ID_PRESENTATION_TIME</p></td> <td class="enum_member_description"> <p>Whether frame presentation - time stamps will be recorded in <span class="type">CoglFrameInfo</span> objects.</p> +time stamps will be recorded in <span class="type">CoglFrameInfo</span> objects.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1913,7 +1913,7 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-PER-VERTEX-POINT-SIZE:CAPS"></a>COGL_FEATURE_ID_PER_VERTEX_POINT_SIZE</p></td> <td class="enum_member_description"> <p>Whether cogl_point_size_in - can be used as an attribute to set a per-vertex point size.</p> +can be used as an attribute to set a per-vertex point size.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1921,8 +1921,8 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-TEXTURE-RG:CAPS"></a>COGL_FEATURE_ID_TEXTURE_RG</p></td> <td class="enum_member_description"> <p>Support for - <a class="link" href="cogl-2.0-experimental-The-Texture-Interface.html#COGL-TEXTURE-COMPONENTS-RG:CAPS"><code class="literal">COGL_TEXTURE_COMPONENTS_RG</code></a> as the internal components of a - texture.</p> +<a class="link" href="cogl-2.0-experimental-The-Texture-Interface.html#COGL-TEXTURE-COMPONENTS-RG:CAPS"><code class="literal">COGL_TEXTURE_COMPONENTS_RG</code></a> as the internal components of a +texture.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1930,8 +1930,8 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C <td class="enum_member_name"><p><a name="COGL-FEATURE-ID-BUFFER-AGE:CAPS"></a>COGL_FEATURE_ID_BUFFER_AGE</p></td> <td class="enum_member_description"> <p>Available if the age of <a class="link" href="cogl-2.0-experimental-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> back - buffers are tracked and so <code class="function">cogl_onscreen_get_buffer_age()</code> can be - expected to return age values other than 0.</p> +buffers are tracked and so <code class="function">cogl_onscreen_get_buffer_age()</code> can be +expected to return age values other than 0.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1966,6 +1966,6 @@ check for them using <a class="link" href="cogl-2.0-experimental-The-Top-Level-C </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Versioning-utility-macros.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Versioning-utility-macros.html index 3ee5ea2a..236eda33 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Versioning-utility-macros.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Versioning-utility-macros.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-utilities.html" title="Utilities"> <link rel="prev" href="cogl-2.0-experimental-GPU-synchronisation-fences.html" title="GPU synchronisation fences"> <link rel="next" href="cogl-integration.html" title="Binding and Integrating"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-2.0-experimental-Versioning-utility-macros.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -76,8 +76,8 @@ <a name="cogl-2.0-experimental-Versioning-utility-macros.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -119,8 +119,8 @@ if we define the following symbols:</p> <tr> <td class="listing_lines" align="right"><pre>1 2</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">COGL_VERSION_MIN_REQUIRED </span><span class="symbol">=</span><span class="normal"> COGL_VERSION_1_6</span> -<span class="normal">COGL_VERSION_MAX_ALLOWED </span><span class="symbol">=</span><span class="normal"> COGL_VERSION_1_8</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">COGL_VERSION_MIN_REQUIRED</span> <span class="o">=</span> <span class="n">COGL_VERSION_1_6</span> +<span class="n">COGL_VERSION_MAX_ALLOWED</span> <span class="o">=</span> <span class="n">COGL_VERSION_1_8</span></pre></td> </tr> </tbody> </table> @@ -136,10 +136,10 @@ if we define the following symbols:</p> 2 3 4</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">COGL_DEPRECATED_IN_1_4 </span><span class="usertype">void</span><span class="normal"> </span><span class="function">cogl_function_A</span><span class="normal"> </span><span class="symbol">(</span><span class="type">void</span><span class="symbol">);</span> -<span class="normal">COGL_DEPRECATED_IN_1_6 </span><span class="usertype">void</span><span class="normal"> </span><span class="function">cogl_function_B</span><span class="normal"> </span><span class="symbol">(</span><span class="type">void</span><span class="symbol">);</span> -<span class="normal">COGL_AVAILABLE_IN_1_8 </span><span class="usertype">void</span><span class="normal"> </span><span class="function">cogl_function_C</span><span class="normal"> </span><span class="symbol">(</span><span class="type">void</span><span class="symbol">);</span> -<span class="normal">COGL_AVAILABLE_IN_1_10 </span><span class="usertype">void</span><span class="normal"> </span><span class="function">cogl_function_D</span><span class="normal"> </span><span class="symbol">(</span><span class="type">void</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">COGL_DEPRECATED_IN_1_4</span> <span class="kt">void</span> <span class="nf">cogl_function_A</span> <span class="p">(</span><span class="kt">void</span><span class="p">);</span> +<span class="n">COGL_DEPRECATED_IN_1_6</span> <span class="kt">void</span> <span class="nf">cogl_function_B</span> <span class="p">(</span><span class="kt">void</span><span class="p">);</span> +<span class="n">COGL_AVAILABLE_IN_1_8</span> <span class="kt">void</span> <span class="nf">cogl_function_C</span> <span class="p">(</span><span class="kt">void</span><span class="p">);</span> +<span class="n">COGL_AVAILABLE_IN_1_10</span> <span class="kt">void</span> <span class="nf">cogl_function_D</span> <span class="p">(</span><span class="kt">void</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -155,10 +155,10 @@ if we define the following symbols:</p> 2 3 4</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">cogl_function_A</span><span class="symbol">:</span><span class="normal"> deprecation warning</span> -<span class="normal">cogl_function_B</span><span class="symbol">:</span><span class="normal"> no warning</span> -<span class="normal">cogl_function_C</span><span class="symbol">:</span><span class="normal"> no warning</span> -<span class="normal">cogl_function_D</span><span class="symbol">:</span><span class="normal"> symbol not available warning</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="nl">cogl_function_A</span><span class="p">:</span> <span class="n">deprecation</span> <span class="n">warning</span> +<span class="nl">cogl_function_B</span><span class="p">:</span> <span class="n">no</span> <span class="n">warning</span> +<span class="nl">cogl_function_C</span><span class="p">:</span> <span class="n">no</span> <span class="n">warning</span> +<span class="nl">cogl_function_D</span><span class="p">:</span> <span class="n">symbol</span> <span class="n">not</span> <span class="n">available</span> <span class="n">warning</span></pre></td> </tr> </tbody> </table> @@ -186,10 +186,10 @@ following code to provide a workaround:</p> 2 3 4</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="preproc">#if</span><span class="normal"> <a href="cogl-2.0-experimental-Versioning-utility-macros.html#COGL-VERSION:CAPS">COGL_VERSION</a> </span><span class="symbol">>=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Versioning-utility-macros.html#COGL-VERSION-ENCODE:CAPS">COGL_VERSION_ENCODE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="number">1</span><span class="symbol">,</span><span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> </span><span class="number">2</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">&&</span><span class="normal"> </span><span class="symbol">\</span> -<span class="normal"> <a href="cogl-2.0-experimental-Versioning-utility-macros.html#COGL-VERSION:CAPS">COGL_VERSION</a> </span><span class="symbol"><=</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Versioning-utility-macros.html#COGL-VERSION-ENCODE:CAPS">COGL_VERSION_ENCODE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="number">1</span><span class="symbol">,</span><span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> </span><span class="number">4</span><span class="symbol">)</span> -<span class="normal"> </span><span class="symbol">/<!--</span><span class="normal"> </span><span class="symbol">-->*</span><span class="normal"> Do </span><span class="usertype">the</span><span class="normal"> workaround </span><span class="symbol">*<!--</span><span class="normal"> </span><span class="symbol">-->/</span> -<span class="preproc">#endif</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="cp">#if COGL_VERSION >= COGL_VERSION_ENCODE (1, 3, 2) && \</span> +<span class="cp"> COGL_VERSION <= COGL_VERSION_ENCODE (1, 3, 4)</span> + <span class="o">/<!--</span> <span class="o">-->*</span> <span class="n">Do</span> <span class="n">the</span> <span class="n">workaround</span> <span class="o">*<!--</span> <span class="o">-->/</span> +<span class="cp">#endif</span></pre></td> </tr> </tbody> </table> @@ -244,12 +244,12 @@ you could write the following:</p> 4 5 6</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="preproc">#if</span><span class="normal"> </span><span class="function"><a href="cogl-2.0-experimental-Versioning-utility-macros.html#COGL-VERSION-CHECK:CAPS">COGL_VERSION_CHECK</a></span><span class="normal"> </span><span class="symbol">(</span><span class="number">2</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">)</span> -<span class="function">cogl_pipeline_frobnicate</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">pipeline</span><span class="symbol">);</span> -<span class="preproc">#else</span> -<span class="symbol">/<!--</span><span class="normal"> </span><span class="symbol">-->*</span><span class="normal"> Frobnication is </span><span class="usertype">not</span><span class="normal"> supported</span><span class="symbol">.</span><span class="normal"> Use a red </span><span class="usertype">color</span><span class="normal"> instead </span><span class="symbol">*<!--</span><span class="normal"> </span><span class="symbol">-->/</span> -<span class="function">cogl_pipeline_set_color_4f</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">pipeline</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">.</span><span class="normal">0f</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">.</span><span class="normal">0f</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">.</span><span class="normal">0f</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">.</span><span class="normal">0f</span><span class="symbol">);</span> -<span class="preproc">#endif</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="cp">#if COGL_VERSION_CHECK (2, 0, 1)</span> +<span class="n">cogl_pipeline_frobnicate</span> <span class="p">(</span><span class="n">pipeline</span><span class="p">);</span> +<span class="cp">#else</span> +<span class="o">/<!--</span> <span class="o">-->*</span> <span class="n">Frobnication</span> <span class="n">is</span> <span class="n">not</span> <span class="n">supported</span><span class="p">.</span> <span class="n">Use</span> <span class="n">a</span> <span class="n">red</span> <span class="n">color</span> <span class="n">instead</span> <span class="o">*<!--</span> <span class="o">-->/</span> +<span class="n">cogl_pipeline_set_color_4f</span> <span class="p">(</span><span class="n">pipeline</span><span class="p">,</span> <span class="mf">1.0f</span><span class="p">,</span> <span class="mf">0.0f</span><span class="p">,</span> <span class="mf">0.0f</span><span class="p">,</span> <span class="mf">1.0f</span><span class="p">);</span> +<span class="cp">#endif</span></pre></td> </tr> </tbody> </table> @@ -403,6 +403,6 @@ with particular versions.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Vertex-Attributes.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Vertex-Attributes.html index 88ab1154..c717542f 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Vertex-Attributes.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Vertex-Attributes.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-buffer-layout-apis.html" title="Describing the layout of GPU Memory"> <link rel="prev" href="cogl-buffer-layout-apis.html" title="Describing the layout of GPU Memory"> <link rel="next" href="cogl-2.0-experimental-Indices.html" title="Indices"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-Vertex-Attributes.top_of_page"></a>Vertex Attributes</span></h2> <p>Vertex Attributes — Functions for declaring and drawing vertex - attributes</p> +attributes</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-Vertex-Attributes.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -95,8 +95,8 @@ <a name="cogl-2.0-experimental-Vertex-Attributes.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword"> </td> @@ -149,11 +149,11 @@ example it's common to define a structure for a single vertex like:</p> 3 4 5</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">typedef</span><span class="normal"> </span><span class="keyword">struct</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">,</span><span class="normal"> z</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">/<!--</span><span class="normal"> </span><span class="symbol">-->*</span><span class="normal"> </span><span class="usertype">position</span><span class="normal"> attribute </span><span class="symbol">*<!--</span><span class="normal"> </span><span class="symbol">-->/</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> s</span><span class="symbol">,</span><span class="normal"> t</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">/<!--</span><span class="normal"> </span><span class="symbol">-->*</span><span class="normal"> texture </span><span class="usertype">coordinate</span><span class="normal"> attribute </span><span class="symbol">*<!--</span><span class="normal"> </span><span class="symbol">-->/</span> -<span class="cbracket">}</span><span class="normal"> MyVertex</span><span class="symbol">;</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="k">typedef</span> <span class="k">struct</span> +<span class="p">{</span> + <span class="kt">float</span> <span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">,</span> <span class="n">z</span><span class="p">;</span> <span class="o">/<!--</span> <span class="o">-->*</span> <span class="n">position</span> <span class="n">attribute</span> <span class="o">*<!--</span> <span class="o">-->/</span> + <span class="kt">float</span> <span class="n">s</span><span class="p">,</span> <span class="n">t</span><span class="p">;</span> <span class="o">/<!--</span> <span class="o">-->*</span> <span class="n">texture</span> <span class="n">coordinate</span> <span class="n">attribute</span> <span class="o">*<!--</span> <span class="o">-->/</span> +<span class="p">}</span> <span class="n">MyVertex</span><span class="p">;</span></pre></td> </tr> </tbody> </table> @@ -166,7 +166,7 @@ example it's common to define a structure for a single vertex like:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">MyVertex</span><span class="normal"> vertices</span><span class="symbol">[</span><span class="number">100</span><span class="symbol">]</span><span class="normal"> </span><span class="symbol">=</span><span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="symbol">....</span><span class="normal"> </span><span class="cbracket">}</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">MyVertex</span> <span class="n">vertices</span><span class="p">[</span><span class="mi">100</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span> <span class="p">....</span> <span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -499,6 +499,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-X11-Texture-From-Pixmap.html b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-X11-Texture-From-Pixmap.html index ac614368..3c9b06fb 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-X11-Texture-From-Pixmap.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-X11-Texture-From-Pixmap.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-meta-textures.html" title="Meta Textures"> <link rel="prev" href="cogl-2.0-experimental-Sliced-Textures.html" title="Sliced Textures"> <link rel="next" href="cogl-primitive-textures.html" title="Primitive Textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-2.0-experimental-X11-Texture-From-Pixmap.top_of_page"></a>X11 Texture From Pixmap</span></h2> <p>X11 Texture From Pixmap — Functions for creating and manipulating 2D meta - textures derived from X11 pixmaps.</p> +textures derived from X11 pixmaps.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-2.0-experimental-X11-Texture-From-Pixmap.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -87,8 +87,8 @@ <a name="cogl-2.0-experimental-X11-Texture-From-Pixmap.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -399,7 +399,35 @@ mentioned in the release notes for the affected release. <a name="cogl-2.0-experimental-X11-Texture-From-Pixmap.other_details"></a><h2>Types and Values</h2> <div class="refsect2"> <a name="CoglTexturePixmapX11"></a><h3>CoglTexturePixmapX11</h3> -<pre class="programlisting">typedef struct _CoglTexturePixmapX11 CoglTexturePixmapX11;</pre> +<pre class="programlisting">typedef struct { + CoglTexture _parent; + + CoglTexturePixmapStereoMode stereo_mode; + CoglTexturePixmapX11 *left; /* Set only if stereo_mode=RIGHT */ + + Pixmap pixmap; + CoglTexture *tex; + + unsigned int depth; + Visual *visual; + + XImage *image; + + XShmSegmentInfo shm_info; + + Damage damage; + CoglTexturePixmapX11ReportLevel damage_report_level; + CoglBool damage_owned; + CoglDamageRectangle damage_rect; + + void *winsys; + + /* During the pre_paint method, this will be set to TRUE if we + should use the winsys texture, otherwise we will use the regular + texture */ + CoglBool use_winsys_texture; +} CoglTexturePixmapX11; +</pre> </div> <hr> <div class="refsect2"> @@ -440,6 +468,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-Blend-Strings.html b/doc/reference/cogl-2.0-experimental/html/cogl-Blend-Strings.html index d0bc4819..1dd4f5cc 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-Blend-Strings.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-Blend-Strings.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-pipeline-apis.html" title="Setting Up A GPU Pipeline"> <link rel="prev" href="cogl-pipeline-apis.html" title="Setting Up A GPU Pipeline"> <link rel="next" href="cogl-2.0-experimental-Pipeline.html" title="Pipeline"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -134,6 +134,6 @@ to this OpenGL code: </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-buffer-apis.html b/doc/reference/cogl-2.0-experimental/html/cogl-buffer-apis.html index 5ef08d8f..80e9d867 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-buffer-apis.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-buffer-apis.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-Shader-snippets.html" title="Shader snippets"> <link rel="next" href="cogl-2.0-experimental-CoglBuffer---The-Buffer-Interface.html" title="CoglBuffer: The Buffer Interface"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-buffer-apis"></a>Allocating GPU Memory</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-buffer-layout-apis.html b/doc/reference/cogl-2.0-experimental/html/cogl-buffer-layout-apis.html index 680ef89e..5665fcd2 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-buffer-layout-apis.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-buffer-layout-apis.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html" title="CoglIndexBuffer: Buffers of vertex indices"> <link rel="next" href="cogl-2.0-experimental-Vertex-Attributes.html" title="Vertex Attributes"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-buffer-layout-apis"></a>Describing the layout of GPU Memory</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-context-apis.html b/doc/reference/cogl-2.0-experimental/html/cogl-context-apis.html index 325175dc..0382e154 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-context-apis.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-context-apis.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-Common-Types.html" title="Common Types"> <link rel="next" href="cogl-2.0-experimental-CoglRenderer---Connect-to-a-backend-renderer.html" title="CoglRenderer: Connect to a backend renderer"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-context-apis"></a>Setting Up A Drawing Context</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-framebuffer-apis.html b/doc/reference/cogl-2.0-experimental/html/cogl-framebuffer-apis.html index 78b6c026..6fad623a 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-framebuffer-apis.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-framebuffer-apis.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html" title="Rectangle textures (non-normalized coordinates)"> <link rel="next" href="cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html" title="CoglFramebuffer: The Framebuffer Interface"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-framebuffer-apis"></a>Framebuffers</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-general-apis.html b/doc/reference/cogl-2.0-experimental/html/cogl-general-apis.html index cf1b568b..be147d98 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-general-apis.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-general-apis.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="next" href="cogl-2.0-experimental-The-Object-Interface.html" title="The Object Interface"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-general-apis"></a>General API concepts</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-integration.html b/doc/reference/cogl-2.0-experimental/html/cogl-integration.html index 3a294146..387b1f6e 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-integration.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-integration.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-Versioning-utility-macros.html" title="Versioning utility macros"> <link rel="next" href="cogl-2.0-experimental-SDL-Integration.html" title="SDL Integration"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-integration"></a>Binding and Integrating</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-meta-textures.html b/doc/reference/cogl-2.0-experimental/html/cogl-meta-textures.html index 6184caf0..041c21fc 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-meta-textures.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-meta-textures.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-The-Texture-Interface.html" title="The Texture Interface"> <link rel="next" href="cogl-2.0-experimental-High-Level-Meta-Textures.html" title="High Level Meta Textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-meta-textures"></a>Meta Textures</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-pipeline-apis.html b/doc/reference/cogl-2.0-experimental/html/cogl-pipeline-apis.html index be34a709..3be4ad53 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-pipeline-apis.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-pipeline-apis.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-The-Top-Level-Context.html" title="The Top-Level Context"> <link rel="next" href="cogl-Blend-Strings.html" title="Blend Strings"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-pipeline-apis"></a>Setting Up A GPU Pipeline</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-primitive-apis.html b/doc/reference/cogl-2.0-experimental/html/cogl-primitive-apis.html index 15f30bae..3fe3b93a 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-primitive-apis.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-primitive-apis.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-Indices.html" title="Indices"> <link rel="next" href="cogl-2.0-experimental-Primitives.html" title="Primitives"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-primitive-apis"></a>Geometry</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-primitive-textures.html b/doc/reference/cogl-2.0-experimental/html/cogl-primitive-textures.html index 19f9a026..37d657ff 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-primitive-textures.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-primitive-textures.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-X11-Texture-From-Pixmap.html" title="X11 Texture From Pixmap"> <link rel="next" href="cogl-2.0-experimental-Low-level-primitive-textures.html" title="Low-level primitive textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-primitive-textures"></a>Primitive Textures</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-textures.html b/doc/reference/cogl-2.0-experimental/html/cogl-textures.html index bb7fe5d6..248e2bdd 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-textures.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-textures.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-Rectangles.html" title="Rectangles"> <link rel="next" href="cogl-2.0-experimental-Bitmap.html" title="Bitmap"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-textures"></a>Textures</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/cogl-utilities.html b/doc/reference/cogl-2.0-experimental/html/cogl-utilities.html index 274f8f66..79789082 100644 --- a/doc/reference/cogl-2.0-experimental/html/cogl-utilities.html +++ b/doc/reference/cogl-2.0-experimental/html/cogl-utilities.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-2.0-experimental-Offscreen-Framebuffers.html" title="Offscreen Framebuffers"> <link rel="next" href="cogl-2.0-experimental-Color-Type.html" title="Color Type"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-utilities"></a>Utilities</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/coglglossary.html b/doc/reference/cogl-2.0-experimental/html/coglglossary.html index 9c2d173d..45906daf 100644 --- a/doc/reference/cogl-2.0-experimental/html/coglglossary.html +++ b/doc/reference/cogl-2.0-experimental/html/coglglossary.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl 2.0 Reference Manual"> <link rel="prev" href="cogl-2.0-experimental-GLES-2.0-context.html" title="GLES 2.0 context"> <link rel="next" href="ix01.html" title="Index of all symbols"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -87,6 +87,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/index.html b/doc/reference/cogl-2.0-experimental/html/index.html index dd9ba547..9a231607 100644 --- a/doc/reference/cogl-2.0-experimental/html/index.html +++ b/doc/reference/cogl-2.0-experimental/html/index.html @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="Cogl 2.0 Reference Manual"> <link rel="next" href="ch01.html" title="Cogl - a modern 3D graphics API"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -81,11 +81,11 @@ combining functions.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Pipeline.html">Pipeline</a></span><span class="refpurpose"> — Functions for creating and manipulating the GPU - pipeline</span> +pipeline</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Depth-State.html">Depth State</a></span><span class="refpurpose"> — Functions for describing the depth testing - state of your GPU.</span> +state of your GPU.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Shader-snippets.html">Shader snippets</a></span><span class="refpurpose"> — Functions for creating and manipulating shader snippets</span> @@ -98,7 +98,7 @@ combining functions.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-CoglAttributeBuffer---Buffers-of-vertex-attributes.html">CoglAttributeBuffer: Buffers of vertex attributes</a></span><span class="refpurpose"> — Functions for creating and manipulating attribute - buffers</span> +buffers</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-CoglIndexBuffer---Buffers-of-vertex-indices.html">CoglIndexBuffer: Buffers of vertex indices</a></span><span class="refpurpose"> — Functions for creating and manipulating vertex @@ -109,7 +109,7 @@ indices.</span> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Vertex-Attributes.html">Vertex Attributes</a></span><span class="refpurpose"> — Functions for declaring and drawing vertex - attributes</span> +attributes</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Indices.html">Indices</a></span><span class="refpurpose"> — Describe vertex indices stored in a <span class="type">CoglIndexBuffer</span>.</span> @@ -119,7 +119,7 @@ indices.</span> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Primitives.html">Primitives</a></span><span class="refpurpose"> — Functions for creating, manipulating and drawing - primitives</span> +primitives</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Path-Primitives.html">Path Primitives</a></span><span class="refpurpose"></span> @@ -141,28 +141,28 @@ indices.</span> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-High-Level-Meta-Textures.html">High Level Meta Textures</a></span><span class="refpurpose"> — Interface for high-level textures built from - low-level textures like <span class="type">CoglTexture2D</span> and - <span class="type">CoglTexture3D</span>.</span> +low-level textures like <span class="type">CoglTexture2D</span> and +<span class="type">CoglTexture3D</span>.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Sub-Textures.html">Sub Textures</a></span><span class="refpurpose"> — Functions for creating and manipulating - sub-textures.</span> +sub-textures.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Sliced-Textures.html">Sliced Textures</a></span><span class="refpurpose"> — Functions for creating and manipulating 2D meta - textures that may internally be comprised of - multiple 2D textures with power-of-two sizes.</span> +textures that may internally be comprised of +multiple 2D textures with power-of-two sizes.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-X11-Texture-From-Pixmap.html">X11 Texture From Pixmap</a></span><span class="refpurpose"> — Functions for creating and manipulating 2D meta - textures derived from X11 pixmaps.</span> +textures derived from X11 pixmaps.</span> </dt> </dl></dd> <dt><span class="section"><a href="cogl-primitive-textures.html">Primitive Textures</a></span></dt> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Low-level-primitive-textures.html">Low-level primitive textures</a></span><span class="refpurpose"> — Interface for low-level textures like - <span class="type">CoglTexture2D</span> and <span class="type">CoglTexture3D</span>.</span> +<span class="type">CoglTexture2D</span> and <span class="type">CoglTexture3D</span>.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-2D-textures.html">2D textures</a></span><span class="refpurpose"> — Functions for creating and manipulating 2D textures</span> @@ -172,7 +172,7 @@ indices.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Rectangle-textures-(non-normalized-coordinates).html">Rectangle textures (non-normalized coordinates)</a></span><span class="refpurpose"> — Functions for creating and manipulating rectangle - textures for use with non-normalized coordinates.</span> +textures for use with non-normalized coordinates.</span> </dt> </dl></dd> <dt><span class="section"><a href="cogl-framebuffer-apis.html">Framebuffers</a></span></dt> @@ -185,7 +185,7 @@ indices.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Offscreen-Framebuffers.html">Offscreen Framebuffers</a></span><span class="refpurpose"> — Functions for creating and manipulating offscreen - framebuffers.</span> +framebuffers.</span> </dt> </dl></dd> <dt><span class="section"><a href="cogl-utilities.html">Utilities</a></span></dt> @@ -198,11 +198,11 @@ indices.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Matrix-Stacks.html">Matrix Stacks</a></span><span class="refpurpose"> — Functions for efficiently tracking many - related transformations</span> +related transformations</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-3-Component-Vectors.html">3 Component Vectors</a></span><span class="refpurpose"> — Functions for handling single precision float - vectors.</span> +vectors.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Eulers-(Rotations).html">Eulers (Rotations)</a></span><span class="refpurpose"> — Functions for initializing and manipulating @@ -223,11 +223,11 @@ quaternions.</span> <dd><dl> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-SDL-Integration.html">SDL Integration</a></span><span class="refpurpose"> — Integration api for the Simple DirectMedia - Layer library.</span> +Layer library.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-Main-loop-integration.html">Main loop integration</a></span><span class="refpurpose"> — Functions for integrating Cogl with an - application's main loop</span> +application's main loop</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-2.0-experimental-GType-Integration-API.html">GType Integration API</a></span><span class="refpurpose"></span> @@ -244,6 +244,6 @@ quaternions.</span> </dl></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/ix01.html b/doc/reference/cogl-2.0-experimental/html/ix01.html index 8f71d2ff..b06b09ac 100644 --- a/doc/reference/cogl-2.0-experimental/html/ix01.html +++ b/doc/reference/cogl-2.0-experimental/html/ix01.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl 2.0 Reference Manual"> <link rel="prev" href="coglglossary.html" title="Glossaries"> <link rel="next" href="ix02.html" title="Index of deprecated symbols"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -2506,6 +2506,6 @@ cogl_swap_chain_set_length, function in CoglSwapChain: Describe a set of back bu <dd></dd> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/license.html b/doc/reference/cogl-2.0-experimental/html/license.html index 078bb341..92e4bb43 100644 --- a/doc/reference/cogl-2.0-experimental/html/license.html +++ b/doc/reference/cogl-2.0-experimental/html/license.html @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="Cogl 2.0 Reference Manual"> <link rel="up" href="index.html" title="Cogl 2.0 Reference Manual"> <link rel="prev" href="ix06.html" title="Index of new symbols in 1.4"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -52,6 +52,6 @@ </p> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-2.0-experimental/html/style.css b/doc/reference/cogl-2.0-experimental/html/style.css index 4be4ede1..b4a1493b 100644 --- a/doc/reference/cogl-2.0-experimental/html/style.css +++ b/doc/reference/cogl-2.0-experimental/html/style.css @@ -293,29 +293,11 @@ h2 .extralinks, h3 .extralinks font-weight: normal; } -acronym,abbr +acronym,abbr { border-bottom: 1px dotted gray; } -/* code listings */ - -.listing_code .programlisting .normal, -.listing_code .programlisting .normal a, -.listing_code .programlisting .number, -.listing_code .programlisting .cbracket, -.listing_code .programlisting .symbol { color: #555753; } -.listing_code .programlisting .comment, -.listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ -.listing_code .programlisting .function, -.listing_code .programlisting .function a, -.listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ -.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */ -.listing_code .programlisting .keyword, -.listing_code .programlisting .usertype, -.listing_code .programlisting .type, -.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */ - .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; @@ -481,3 +463,71 @@ acronym,abbr } } +.hll { background-color: #ffffcc } +.c { color: #408080; font-style: italic } /* Comment */ +.err { border: 1px solid #FF0000 } /* Error */ +.k { color: #008000; font-weight: bold } /* Keyword */ +.o { color: #666666 } /* Operator */ +.ch { color: #408080; font-style: italic } /* Comment.Hashbang */ +.cm { color: #408080; font-style: italic } /* Comment.Multiline */ +.cp { color: #BC7A00 } /* Comment.Preproc */ +.cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ +.c1 { color: #408080; font-style: italic } /* Comment.Single */ +.cs { color: #408080; font-style: italic } /* Comment.Special */ +.gd { color: #A00000 } /* Generic.Deleted */ +.ge { font-style: italic } /* Generic.Emph */ +.gr { color: #FF0000 } /* Generic.Error */ +.gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.gi { color: #00A000 } /* Generic.Inserted */ +.go { color: #888888 } /* Generic.Output */ +.gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.gs { font-weight: bold } /* Generic.Strong */ +.gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.gt { color: #0044DD } /* Generic.Traceback */ +.kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +.kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +.kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +.kp { color: #008000 } /* Keyword.Pseudo */ +.kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +.kt { color: #B00040 } /* Keyword.Type */ +.m { color: #666666 } /* Literal.Number */ +.s { color: #BA2121 } /* Literal.String */ +.na { color: #7D9029 } /* Name.Attribute */ +.nb { color: #008000 } /* Name.Builtin */ +.nc { color: #0000FF; font-weight: bold } /* Name.Class */ +.no { color: #880000 } /* Name.Constant */ +.nd { color: #AA22FF } /* Name.Decorator */ +.ni { color: #999999; font-weight: bold } /* Name.Entity */ +.ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.nf { color: #0000FF } /* Name.Function */ +.nl { color: #A0A000 } /* Name.Label */ +.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.nt { color: #008000; font-weight: bold } /* Name.Tag */ +.nv { color: #19177C } /* Name.Variable */ +.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.w { color: #bbbbbb } /* Text.Whitespace */ +.mb { color: #666666 } /* Literal.Number.Bin */ +.mf { color: #666666 } /* Literal.Number.Float */ +.mh { color: #666666 } /* Literal.Number.Hex */ +.mi { color: #666666 } /* Literal.Number.Integer */ +.mo { color: #666666 } /* Literal.Number.Oct */ +.sa { color: #BA2121 } /* Literal.String.Affix */ +.sb { color: #BA2121 } /* Literal.String.Backtick */ +.sc { color: #BA2121 } /* Literal.String.Char */ +.dl { color: #BA2121 } /* Literal.String.Delimiter */ +.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +.s2 { color: #BA2121 } /* Literal.String.Double */ +.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.sh { color: #BA2121 } /* Literal.String.Heredoc */ +.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.sx { color: #008000 } /* Literal.String.Other */ +.sr { color: #BB6688 } /* Literal.String.Regex */ +.s1 { color: #BA2121 } /* Literal.String.Single */ +.ss { color: #19177C } /* Literal.String.Symbol */ +.bp { color: #008000 } /* Name.Builtin.Pseudo */ +.fm { color: #0000FF } /* Name.Function.Magic */ +.vc { color: #19177C } /* Name.Variable.Class */ +.vg { color: #19177C } /* Name.Variable.Global */ +.vi { color: #19177C } /* Name.Variable.Instance */ +.vm { color: #19177C } /* Name.Variable.Magic */ +.il { color: #666666 } /* Literal.Number.Integer.Long */
\ No newline at end of file diff --git a/doc/reference/cogl-gst/Makefile.in b/doc/reference/cogl-gst/Makefile.in index f4406cdb..eb79322a 100644 --- a/doc/reference/cogl-gst/Makefile.in +++ b/doc/reference/cogl-gst/Makefile.in @@ -719,11 +719,11 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@BUILD_GTK_DOC_FALSE@uninstall-local: -@BUILD_GTK_DOC_FALSE@clean-local: @BUILD_GTK_DOC_FALSE@distclean-local: +@BUILD_GTK_DOC_FALSE@uninstall-local: @BUILD_GTK_DOC_FALSE@maintainer-clean-local: @BUILD_GTK_DOC_FALSE@install-data-local: +@BUILD_GTK_DOC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/doc/reference/cogl-gst/cogl-gst-docs.xml b/doc/reference/cogl-gst/cogl-gst-docs.xml index 69a4fc77..8b0785ff 100644 --- a/doc/reference/cogl-gst/cogl-gst-docs.xml +++ b/doc/reference/cogl-gst/cogl-gst-docs.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY version "1.22.6"> +<!ENTITY version "1.22.8"> ]> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> diff --git a/doc/reference/cogl-gst/html/CoglGstVideoSink.html b/doc/reference/cogl-gst/html/CoglGstVideoSink.html index 9c5f4a35..18dbc0ad 100644 --- a/doc/reference/cogl-gst/html/CoglGstVideoSink.html +++ b/doc/reference/cogl-gst/html/CoglGstVideoSink.html @@ -8,7 +8,7 @@ <link rel="up" href="cogl-gst-general-apis.html" title="General APIs"> <link rel="prev" href="cogl-gst-general-apis.html" title="General APIs"> <link rel="next" href="coglglossary.html" title="Glossaries"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -31,7 +31,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="CoglGstVideoSink.top_of_page"></a>CoglGstVideoSink</span></h2> <p>CoglGstVideoSink — A video sink for integrating a GStreamer - pipeline with a Cogl pipeline.</p> +pipeline with a Cogl pipeline.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -39,8 +39,8 @@ <a name="CoglGstVideoSink.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -169,9 +169,9 @@ <a name="CoglGstVideoSink.signals"></a><h2>Signals</h2> <div class="informaltable"><table class="informaltable" border="0"> <colgroup> -<col width="150px" class="signals_return"> -<col width="300px" class="signals_name"> -<col width="200px" class="signals_flags"> +<col width="150px" class="signal_proto_type"> +<col width="300px" class="signal_proto_name"> +<col width="200px" class="signal_proto_flags"> </colgroup> <tbody> <tr> @@ -191,8 +191,8 @@ <a name="CoglGstVideoSink.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -835,6 +835,7 @@ should be accessed using the provided API.</p> <a name="CoglGstVideoSink--update-priority"></a><h3>The <code class="literal">“update-priorityâ€</code> property</h3> <pre class="programlisting"> “update-priority†<span class="type">gint</span></pre> <p>Priority of video updates in the thread.</p> +<p>Owner: CoglGstVideoSink</p> <p>Flags: Read / Write</p> <p>Allowed values: >= -2147483647</p> <p>Default value: 100</p> @@ -923,6 +924,6 @@ could also create its pipeline in the handler for that.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-gst/html/ch01.html b/doc/reference/cogl-gst/html/ch01.html index 73895c85..3e5523ca 100644 --- a/doc/reference/cogl-gst/html/ch01.html +++ b/doc/reference/cogl-gst/html/ch01.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl GST 2.0 Reference Manual"> <link rel="prev" href="index.html" title="Cogl GST 2.0 Reference Manual"> <link rel="next" href="cogl-gst-general-apis.html" title="General APIs"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -27,7 +27,7 @@ <dt><span class="section"><a href="cogl-gst-general-apis.html">General APIs</a></span></dt> <dd><dl><dt> <span class="refentrytitle"><a href="CoglGstVideoSink.html">CoglGstVideoSink</a></span><span class="refpurpose"> — A video sink for integrating a GStreamer - pipeline with a Cogl pipeline.</span> +pipeline with a Cogl pipeline.</span> </dt></dl></dd> </dl></div> <div class="section"> @@ -39,6 +39,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-gst/html/cogl-gst-general-apis.html b/doc/reference/cogl-gst/html/cogl-gst-general-apis.html index e1d58e4a..4032afcf 100644 --- a/doc/reference/cogl-gst/html/cogl-gst-general-apis.html +++ b/doc/reference/cogl-gst/html/cogl-gst-general-apis.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl GST - a library for integrating GStreamer with Cogl"> <link rel="prev" href="ch01.html" title="Cogl GST - a library for integrating GStreamer with Cogl"> <link rel="next" href="CoglGstVideoSink.html" title="CoglGstVideoSink"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,6 +22,6 @@ <div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="cogl-gst-general-apis"></a>General APIs</h2></div></div></div></div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-gst/html/coglglossary.html b/doc/reference/cogl-gst/html/coglglossary.html index 84ee9da5..9b833b13 100644 --- a/doc/reference/cogl-gst/html/coglglossary.html +++ b/doc/reference/cogl-gst/html/coglglossary.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl GST 2.0 Reference Manual"> <link rel="prev" href="CoglGstVideoSink.html" title="CoglGstVideoSink"> <link rel="next" href="ix01.html" title="Index of all symbols"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -55,6 +55,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-gst/html/index.html b/doc/reference/cogl-gst/html/index.html index c414941b..d61ca88a 100644 --- a/doc/reference/cogl-gst/html/index.html +++ b/doc/reference/cogl-gst/html/index.html @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="Cogl GST 2.0 Reference Manual"> <link rel="next" href="ch01.html" title="Cogl GST - a library for integrating GStreamer with Cogl"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -14,7 +14,7 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Cogl GST 2.0 Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">for Cogl 1.22.6</p></div> +<div><p class="releaseinfo">for Cogl 1.22.8</p></div> <div><p class="copyright">Copyright © 2013 Intel Corporation</p></div> <div><div class="legalnotice"> <a name="id-1.1.4"></a><p> @@ -48,7 +48,7 @@ <dt><span class="section"><a href="cogl-gst-general-apis.html">General APIs</a></span></dt> <dd><dl><dt> <span class="refentrytitle"><a href="CoglGstVideoSink.html">CoglGstVideoSink</a></span><span class="refpurpose"> — A video sink for integrating a GStreamer - pipeline with a Cogl pipeline.</span> +pipeline with a Cogl pipeline.</span> </dt></dl></dd> </dl></dd> <dt><span class="chapter"><a href="coglglossary.html">Glossaries</a></span></dt> @@ -58,6 +58,6 @@ </dl></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-gst/html/ix01.html b/doc/reference/cogl-gst/html/ix01.html index 82884ca7..df07ca04 100644 --- a/doc/reference/cogl-gst/html/ix01.html +++ b/doc/reference/cogl-gst/html/ix01.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl GST 2.0 Reference Manual"> <link rel="prev" href="coglglossary.html" title="Glossaries"> <link rel="next" href="license.html" title="Appendix A. License"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -100,6 +100,6 @@ <dd></dd> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-gst/html/license.html b/doc/reference/cogl-gst/html/license.html index e929122d..40635a5d 100644 --- a/doc/reference/cogl-gst/html/license.html +++ b/doc/reference/cogl-gst/html/license.html @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="Cogl GST 2.0 Reference Manual"> <link rel="up" href="index.html" title="Cogl GST 2.0 Reference Manual"> <link rel="prev" href="ix01.html" title="Index of all symbols"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -52,6 +52,6 @@ </p> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl-gst/html/style.css b/doc/reference/cogl-gst/html/style.css index 4be4ede1..b4a1493b 100644 --- a/doc/reference/cogl-gst/html/style.css +++ b/doc/reference/cogl-gst/html/style.css @@ -293,29 +293,11 @@ h2 .extralinks, h3 .extralinks font-weight: normal; } -acronym,abbr +acronym,abbr { border-bottom: 1px dotted gray; } -/* code listings */ - -.listing_code .programlisting .normal, -.listing_code .programlisting .normal a, -.listing_code .programlisting .number, -.listing_code .programlisting .cbracket, -.listing_code .programlisting .symbol { color: #555753; } -.listing_code .programlisting .comment, -.listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ -.listing_code .programlisting .function, -.listing_code .programlisting .function a, -.listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ -.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */ -.listing_code .programlisting .keyword, -.listing_code .programlisting .usertype, -.listing_code .programlisting .type, -.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */ - .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; @@ -481,3 +463,71 @@ acronym,abbr } } +.hll { background-color: #ffffcc } +.c { color: #408080; font-style: italic } /* Comment */ +.err { border: 1px solid #FF0000 } /* Error */ +.k { color: #008000; font-weight: bold } /* Keyword */ +.o { color: #666666 } /* Operator */ +.ch { color: #408080; font-style: italic } /* Comment.Hashbang */ +.cm { color: #408080; font-style: italic } /* Comment.Multiline */ +.cp { color: #BC7A00 } /* Comment.Preproc */ +.cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ +.c1 { color: #408080; font-style: italic } /* Comment.Single */ +.cs { color: #408080; font-style: italic } /* Comment.Special */ +.gd { color: #A00000 } /* Generic.Deleted */ +.ge { font-style: italic } /* Generic.Emph */ +.gr { color: #FF0000 } /* Generic.Error */ +.gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.gi { color: #00A000 } /* Generic.Inserted */ +.go { color: #888888 } /* Generic.Output */ +.gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.gs { font-weight: bold } /* Generic.Strong */ +.gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.gt { color: #0044DD } /* Generic.Traceback */ +.kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +.kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +.kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +.kp { color: #008000 } /* Keyword.Pseudo */ +.kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +.kt { color: #B00040 } /* Keyword.Type */ +.m { color: #666666 } /* Literal.Number */ +.s { color: #BA2121 } /* Literal.String */ +.na { color: #7D9029 } /* Name.Attribute */ +.nb { color: #008000 } /* Name.Builtin */ +.nc { color: #0000FF; font-weight: bold } /* Name.Class */ +.no { color: #880000 } /* Name.Constant */ +.nd { color: #AA22FF } /* Name.Decorator */ +.ni { color: #999999; font-weight: bold } /* Name.Entity */ +.ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.nf { color: #0000FF } /* Name.Function */ +.nl { color: #A0A000 } /* Name.Label */ +.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.nt { color: #008000; font-weight: bold } /* Name.Tag */ +.nv { color: #19177C } /* Name.Variable */ +.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.w { color: #bbbbbb } /* Text.Whitespace */ +.mb { color: #666666 } /* Literal.Number.Bin */ +.mf { color: #666666 } /* Literal.Number.Float */ +.mh { color: #666666 } /* Literal.Number.Hex */ +.mi { color: #666666 } /* Literal.Number.Integer */ +.mo { color: #666666 } /* Literal.Number.Oct */ +.sa { color: #BA2121 } /* Literal.String.Affix */ +.sb { color: #BA2121 } /* Literal.String.Backtick */ +.sc { color: #BA2121 } /* Literal.String.Char */ +.dl { color: #BA2121 } /* Literal.String.Delimiter */ +.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +.s2 { color: #BA2121 } /* Literal.String.Double */ +.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.sh { color: #BA2121 } /* Literal.String.Heredoc */ +.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.sx { color: #008000 } /* Literal.String.Other */ +.sr { color: #BB6688 } /* Literal.String.Regex */ +.s1 { color: #BA2121 } /* Literal.String.Single */ +.ss { color: #19177C } /* Literal.String.Symbol */ +.bp { color: #008000 } /* Name.Builtin.Pseudo */ +.fm { color: #0000FF } /* Name.Function.Magic */ +.vc { color: #19177C } /* Name.Variable.Class */ +.vg { color: #19177C } /* Name.Variable.Global */ +.vi { color: #19177C } /* Name.Variable.Instance */ +.vm { color: #19177C } /* Name.Variable.Magic */ +.il { color: #666666 } /* Literal.Number.Integer.Long */
\ No newline at end of file diff --git a/doc/reference/cogl/Makefile.in b/doc/reference/cogl/Makefile.in index db55e4f3..10f1076e 100644 --- a/doc/reference/cogl/Makefile.in +++ b/doc/reference/cogl/Makefile.in @@ -766,11 +766,11 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@BUILD_GTK_DOC_FALSE@maintainer-clean-local: +@BUILD_GTK_DOC_FALSE@install-data-local: +@BUILD_GTK_DOC_FALSE@distclean-local: @BUILD_GTK_DOC_FALSE@uninstall-local: @BUILD_GTK_DOC_FALSE@clean-local: -@BUILD_GTK_DOC_FALSE@distclean-local: -@BUILD_GTK_DOC_FALSE@install-data-local: -@BUILD_GTK_DOC_FALSE@maintainer-clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/doc/reference/cogl/cogl-docs.xml b/doc/reference/cogl/cogl-docs.xml index d92b1278..84e7dae8 100644 --- a/doc/reference/cogl/cogl-docs.xml +++ b/doc/reference/cogl/cogl-docs.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY version "1.22.6"> +<!ENTITY version "1.22.8"> ]> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> diff --git a/doc/reference/cogl/html/ch01.html b/doc/reference/cogl/html/ch01.html index fbe94f9f..fae5ef22 100644 --- a/doc/reference/cogl/html/ch01.html +++ b/doc/reference/cogl/html/ch01.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl Reference Manual"> <link rel="prev" href="index.html" title="Cogl Reference Manual"> <link rel="next" href="cogl-General-API.html" title="General API"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -51,7 +51,7 @@ combining functions.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-Vertex-Buffers.html">Vertex Buffers</a></span><span class="refpurpose"> — An API for submitting extensible arrays of vertex - attributes to be mapped into the GPU for fast drawing.</span> +attributes to be mapped into the GPU for fast drawing.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-Matrices.html">Matrices</a></span><span class="refpurpose"> — Functions for initializing and manipulating 4x4 matrices</span> @@ -61,7 +61,7 @@ combining functions.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-Offscreen-Buffers.html">Offscreen Buffers</a></span><span class="refpurpose"> — Functions for creating and manipulating offscreen - framebuffers.</span> +framebuffers.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-Bitmaps.html">Bitmaps</a></span><span class="refpurpose"> — Functions for loading images</span> @@ -85,6 +85,6 @@ combining functions.</span> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/ch02.html b/doc/reference/cogl/html/ch02.html index 488ede77..55ac7bba 100644 --- a/doc/reference/cogl/html/ch02.html +++ b/doc/reference/cogl/html/ch02.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl Reference Manual"> <link rel="prev" href="cogl-GType-Integration-API.html" title="GType Integration API"> <link rel="next" href="cogl-Buffers.html" title="Buffers"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -29,7 +29,7 @@ </dt> <dt> <span class="refentrytitle"><a href="cogl-Vectors.html">Vectors</a></span><span class="refpurpose"> — Functions for handling single precision float - vectors.</span> +vectors.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-3D-textures.html">3D textures</a></span><span class="refpurpose"> — Functions for creating and manipulating 3D textures</span> @@ -53,6 +53,6 @@ quaternions.</span> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/ch03.html b/doc/reference/cogl/html/ch03.html index 6e7188ba..8f6909d7 100644 --- a/doc/reference/cogl/html/ch03.html +++ b/doc/reference/cogl/html/ch03.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl Reference Manual"> <link rel="prev" href="cogl-Quaternions-(Rotations).html" title="Quaternions (Rotations)"> <link rel="next" href="cogl-General-API-(Deprecated).html" title="General API (Deprecated)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -60,6 +60,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-3D-textures.html b/doc/reference/cogl/html/cogl-3D-textures.html index 60d8ffba..614ad62c 100644 --- a/doc/reference/cogl/html/cogl-3D-textures.html +++ b/doc/reference/cogl/html/cogl-3D-textures.html @@ -8,7 +8,7 @@ <link rel="up" href="ch02.html" title="Cogl experimental API"> <link rel="prev" href="cogl-Vectors.html" title="Vectors"> <link rel="next" href="cogl-Quaternions-(Rotations).html" title="Quaternions (Rotations)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-3D-textures.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -309,11 +309,8 @@ mentioned in the release notes for the affected release. "><span class="acronym">Unstable</span></acronym></p> </div> </div> -<div class="refsect1"> -<a name="cogl-3D-textures.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Bitmaps.html b/doc/reference/cogl/html/cogl-Bitmaps.html index 0eeeadbc..f656ea9c 100644 --- a/doc/reference/cogl/html/cogl-Bitmaps.html +++ b/doc/reference/cogl/html/cogl-Bitmaps.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Offscreen-Buffers.html" title="Offscreen Buffers"> <link rel="next" href="cogl-Fixed-Point-API.html" title="Fixed Point API"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Bitmaps.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -70,8 +70,8 @@ <a name="cogl-Bitmaps.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -217,9 +217,9 @@ and <code class="literal">FALSE</code> otherwise</p> <div class="refsect2"> <a name="CoglBitmapError"></a><h3>enum CoglBitmapError</h3> <p>Error codes that can be thrown when performing bitmap -operations. Note that <a href="http://library.gnome.org/devel/gdk-pixbuf/unstable/gdk-pixbuf-File-Loading.html#gdk-pixbuf-new-from-file"><code class="function">gdk_pixbuf_new_from_file()</code></a> can also throw +operations. Note that <code class="function">gdk_pixbuf_new_from_file()</code> can also throw errors directly from the underlying image loading library. For -example, if GdkPixbuf is used then errors <a href="http://library.gnome.org/devel/gdk-pixbuf/unstable/gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbufError"><span class="type">GdkPixbufError</span></a>s +example, if GdkPixbuf is used then errors <span class="type">GdkPixbufError</span>s will be used directly.</p> <div class="refsect3"> <a name="CoglBitmapError.members"></a><h4>Members</h4> @@ -234,7 +234,7 @@ will be used directly.</p> <td class="enum_member_name"><p><a name="COGL-BITMAP-ERROR-FAILED:CAPS"></a>COGL_BITMAP_ERROR_FAILED</p></td> <td class="enum_member_description"> <p>Generic failure code, something went - wrong.</p> +wrong.</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -268,6 +268,6 @@ will be used directly.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Blend-Strings.html b/doc/reference/cogl/html/cogl-Blend-Strings.html index ba57afb7..70788b2d 100644 --- a/doc/reference/cogl/html/cogl-Blend-Strings.html +++ b/doc/reference/cogl/html/cogl-Blend-Strings.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Textures.html" title="Textures"> <link rel="next" href="cogl-Materials.html" title="Materials"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -134,6 +134,6 @@ to this OpenGL code: </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Buffers.html b/doc/reference/cogl/html/cogl-Buffers.html index 1ef15861..2b7ed680 100644 --- a/doc/reference/cogl/html/cogl-Buffers.html +++ b/doc/reference/cogl/html/cogl-Buffers.html @@ -8,7 +8,7 @@ <link rel="up" href="ch02.html" title="Cogl experimental API"> <link rel="prev" href="ch02.html" title="Cogl experimental API"> <link rel="next" href="cogl-Vectors.html" title="Vectors"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -52,8 +52,8 @@ mentioned in the release notes for the affected release. <a name="cogl-Buffers.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -134,8 +134,8 @@ mentioned in the release notes for the affected release. <a name="cogl-Buffers.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -653,7 +653,7 @@ the buffer data is going to be updated.</p> <td class="enum_member_name"><p><a name="COGL-BUFFER-UPDATE-HINT-STREAM:CAPS"></a>COGL_BUFFER_UPDATE_HINT_STREAM</p></td> <td class="enum_member_description"> <p>the buffer will be used once or a couple of - times</p> +times</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -707,7 +707,7 @@ mentioned in the release notes for the affected release. <td class="enum_member_name"><p><a name="COGL-BUFFER-ACCESS-READ-WRITE:CAPS"></a>COGL_BUFFER_ACCESS_READ_WRITE</p></td> <td class="enum_member_description"> <p>the buffer will be used for both reading and - writing</p> +writing</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -733,6 +733,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Clipping-(Deprecated).html b/doc/reference/cogl/html/cogl-Clipping-(Deprecated).html index fdd1ab91..30c8873e 100644 --- a/doc/reference/cogl/html/cogl-Clipping-(Deprecated).html +++ b/doc/reference/cogl/html/cogl-Clipping-(Deprecated).html @@ -8,7 +8,7 @@ <link rel="up" href="ch03.html" title="Cogl deprecated API"> <link rel="prev" href="cogl-Materials-(Deprecated).html" title="Materials (Deprecated)"> <link rel="next" href="cogl-Vertex-Buffers-(Deprecated).html" title="Vertex Buffers (Deprecated)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Clipping-(Deprecated).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -247,11 +247,8 @@ by <a class="link" href="cogl-Clipping-(Deprecated).html#cogl-clip-stack-save" t <p class="since">Since: 0.8.2</p> </div> </div> -<div class="refsect1"> -<a name="cogl-Clipping-(Deprecated).other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Clipping.html b/doc/reference/cogl/html/cogl-Clipping.html index 05320a4f..07de179f 100644 --- a/doc/reference/cogl/html/cogl-Clipping.html +++ b/doc/reference/cogl/html/cogl-Clipping.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Path-Primitives.html" title="Path Primitives"> <link rel="next" href="cogl-Vertex-Buffers.html" title="Vertex Buffers"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Clipping.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -193,11 +193,8 @@ cogl_clip_pop (<em class="parameter"><code><span class="type">void</span></code> <a class="link" href="cogl-Clipping-(Deprecated).html#cogl-clip-push" title="cogl_clip_push ()"><code class="function">cogl_clip_push()</code></a>.</p> </div> </div> -<div class="refsect1"> -<a name="cogl-Clipping.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Color-Type.html b/doc/reference/cogl/html/cogl-Color-Type.html index ea67add2..df6bccb5 100644 --- a/doc/reference/cogl/html/cogl-Color-Type.html +++ b/doc/reference/cogl/html/cogl-Color-Type.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-General-API.html" title="General API"> <link rel="next" href="cogl-Textures.html" title="Textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Color-Type.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -338,8 +338,8 @@ <a name="cogl-Color-Type.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">struct</td> @@ -1605,6 +1605,6 @@ directly.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Fixed-Point-API.html b/doc/reference/cogl/html/cogl-Fixed-Point-API.html index b6d3e5ec..0434c8a3 100644 --- a/doc/reference/cogl/html/cogl-Fixed-Point-API.html +++ b/doc/reference/cogl/html/cogl-Fixed-Point-API.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Bitmaps.html" title="Bitmaps"> <link rel="next" href="cogl-GType-Integration-API.html" title="GType Integration API"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Fixed-Point-API.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -292,8 +292,8 @@ <a name="cogl-Fixed-Point-API.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -697,7 +697,7 @@ double precision.</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">res </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-Fixed-Point-API.html#COGL-FIXED-DIV:CAPS">COGL_FIXED_DIV</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="cogl-Fixed-Point-API.html#COGL-FIXED-MUL:CAPS">COGL_FIXED_MUL</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">a</span><span class="symbol">,</span><span class="normal"> b</span><span class="symbol">),</span><span class="normal"> c</span><span class="symbol">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">res</span> <span class="o">=</span> <span class="n">COGL_FIXED_DIV</span> <span class="p">(</span><span class="n">COGL_FIXED_MUL</span> <span class="p">(</span><span class="n">a</span><span class="p">,</span> <span class="n">b</span><span class="p">),</span> <span class="n">c</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -1600,6 +1600,6 @@ full circle (i.e., 2 * pi).</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-GType-Integration-API.html b/doc/reference/cogl/html/cogl-GType-Integration-API.html index 91de76d4..38872d40 100644 --- a/doc/reference/cogl/html/cogl-GType-Integration-API.html +++ b/doc/reference/cogl/html/cogl-GType-Integration-API.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Fixed-Point-API.html" title="Fixed Point API"> <link rel="next" href="ch02.html" title="Cogl experimental API"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-GType-Integration-API.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody><tr> <td class="function_type"> @@ -69,11 +69,8 @@ can be used for example to define GObject properties that accept a </div> </div> </div> -<div class="refsect1"> -<a name="cogl-GType-Integration-API.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-General-API-(Deprecated).html b/doc/reference/cogl/html/cogl-General-API-(Deprecated).html index 96482825..e458ecd9 100644 --- a/doc/reference/cogl/html/cogl-General-API-(Deprecated).html +++ b/doc/reference/cogl/html/cogl-General-API-(Deprecated).html @@ -8,7 +8,7 @@ <link rel="up" href="ch03.html" title="Cogl deprecated API"> <link rel="prev" href="ch03.html" title="Cogl deprecated API"> <link rel="next" href="cogl-Textures-(Deprecated).html" title="Textures (Deprecated)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-General-API-(Deprecated).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -102,7 +102,7 @@ cogl_check_extension (<em class="parameter"><code>const <span class="type">char< <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglBool</span><span class="normal"> retval </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="function">strstr</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">ext</span><span class="symbol">,</span><span class="normal"> name</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">!=</span><span class="normal"> NULL</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">?</span><span class="normal"> TRUE </span><span class="symbol">:</span><span class="normal"> FALSE</span><span class="symbol">;</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglBool</span> <span class="n">retval</span> <span class="o">=</span> <span class="p">(</span><span class="n">strstr</span> <span class="p">(</span><span class="n">ext</span><span class="p">,</span> <span class="n">name</span><span class="p">)</span> <span class="o">!=</span> <span class="nb">NULL</span><span class="p">)</span> <span class="o">?</span> <span class="nl">TRUE</span> <span class="p">:</span> <span class="n">FALSE</span><span class="p">;</span></pre></td> </tr> </tbody> </table> @@ -270,11 +270,8 @@ cogl_get_depth_test_enabled (<em class="parameter"><code><span class="type">void </div> </div> </div> -<div class="refsect1"> -<a name="cogl-General-API-(Deprecated).other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-General-API.html b/doc/reference/cogl/html/cogl-General-API.html index 73d41ae7..019e1bbe 100644 --- a/doc/reference/cogl/html/cogl-General-API.html +++ b/doc/reference/cogl/html/cogl-General-API.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="next" href="cogl-Color-Type.html" title="Color Type"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-General-API.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -390,8 +390,8 @@ <a name="cogl-General-API.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -1906,12 +1906,12 @@ but if you are trying to do something like:</p> 4 5 6</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="cbracket">{</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> setup some </span><span class="usertype">OpenGL</span><span class="normal"> state</span><span class="symbol">.</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> draw </span><span class="usertype">using</span><span class="normal"> </span><span class="function">OpenGL</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">e</span><span class="symbol">.</span><span class="normal">g</span><span class="symbol">.</span><span class="normal"> </span><span class="function">glDrawArrays</span><span class="symbol">()</span><span class="normal"> </span><span class="symbol">)</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> reset modified </span><span class="usertype">OpenGL</span><span class="normal"> state</span><span class="symbol">.</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> </span><span class="keyword">continue</span><span class="normal"> using Cogl to draw</span> -<span class="cbracket">}</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">{</span> + <span class="o">-</span> <span class="n">setup</span> <span class="n">some</span> <span class="n">OpenGL</span> <span class="n">state</span><span class="p">.</span> + <span class="o">-</span> <span class="n">draw</span> <span class="n">using</span> <span class="n">OpenGL</span> <span class="p">(</span><span class="n">e</span><span class="p">.</span><span class="n">g</span><span class="p">.</span> <span class="n">glDrawArrays</span><span class="p">()</span> <span class="p">)</span> + <span class="o">-</span> <span class="n">reset</span> <span class="n">modified</span> <span class="n">OpenGL</span> <span class="n">state</span><span class="p">.</span> + <span class="o">-</span> <span class="k">continue</span> <span class="n">using</span> <span class="n">Cogl</span> <span class="n">to</span> <span class="n">draw</span> +<span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -1932,14 +1932,14 @@ and <a class="link" href="cogl-General-API.html#cogl-end-gl" title="cogl_end_gl 6 7 8</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="cbracket">{</span> -<span class="normal"> </span><span class="function"><a href="cogl-General-API.html#cogl-begin-gl">cogl_begin_gl</a></span><span class="normal"> </span><span class="symbol">();</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> setup some </span><span class="usertype">OpenGL</span><span class="normal"> state</span><span class="symbol">.</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> draw </span><span class="usertype">using</span><span class="normal"> </span><span class="function">OpenGL</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">e</span><span class="symbol">.</span><span class="normal">g</span><span class="symbol">.</span><span class="normal"> </span><span class="function">glDrawArrays</span><span class="symbol">()</span><span class="normal"> </span><span class="symbol">)</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> reset modified </span><span class="usertype">OpenGL</span><span class="normal"> state</span><span class="symbol">.</span> -<span class="normal"> </span><span class="function"><a href="cogl-General-API.html#cogl-end-gl">cogl_end_gl</a></span><span class="normal"> </span><span class="symbol">();</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> </span><span class="keyword">continue</span><span class="normal"> using Cogl to draw</span> -<span class="cbracket">}</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">{</span> + <span class="n">cogl_begin_gl</span> <span class="p">();</span> + <span class="o">-</span> <span class="n">setup</span> <span class="n">some</span> <span class="n">OpenGL</span> <span class="n">state</span><span class="p">.</span> + <span class="o">-</span> <span class="n">draw</span> <span class="n">using</span> <span class="n">OpenGL</span> <span class="p">(</span><span class="n">e</span><span class="p">.</span><span class="n">g</span><span class="p">.</span> <span class="n">glDrawArrays</span><span class="p">()</span> <span class="p">)</span> + <span class="o">-</span> <span class="n">reset</span> <span class="n">modified</span> <span class="n">OpenGL</span> <span class="n">state</span><span class="p">.</span> + <span class="n">cogl_end_gl</span> <span class="p">();</span> + <span class="o">-</span> <span class="k">continue</span> <span class="n">using</span> <span class="n">Cogl</span> <span class="n">to</span> <span class="n">draw</span> +<span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -1956,11 +1956,11 @@ and <a class="link" href="cogl-General-API.html#cogl-end-gl" title="cogl_end_gl 3 4 5</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="cbracket">{</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> setup some </span><span class="usertype">OpenGL</span><span class="normal"> state</span><span class="symbol">.</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> use Cogl to draw</span> -<span class="normal"> </span><span class="symbol">-</span><span class="normal"> reset modified </span><span class="usertype">OpenGL</span><span class="normal"> state</span><span class="symbol">.</span> -<span class="cbracket">}</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">{</span> + <span class="o">-</span> <span class="n">setup</span> <span class="n">some</span> <span class="n">OpenGL</span> <span class="n">state</span><span class="p">.</span> + <span class="o">-</span> <span class="n">use</span> <span class="n">Cogl</span> <span class="n">to</span> <span class="n">draw</span> + <span class="o">-</span> <span class="n">reset</span> <span class="n">modified</span> <span class="n">OpenGL</span> <span class="n">state</span><span class="p">.</span> +<span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -2045,22 +2045,22 @@ on an object something like this:</p> 14 15 16</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="usertype">CoglUserDataKey</span><span class="normal"> path_private_key</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="k">static</span> <span class="n">CoglUserDataKey</span> <span class="n">path_private_key</span><span class="p">;</span> -<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span> -<span class="function">destroy_path_private_cb</span><span class="normal"> </span><span class="symbol">(</span><span class="type">void</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">data</span><span class="symbol">)</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="function">g_free</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">);</span> -<span class="cbracket">}</span> +<span class="k">static</span> <span class="kt">void</span> +<span class="nf">destroy_path_private_cb</span> <span class="p">(</span><span class="kt">void</span> <span class="o">*</span><span class="n">data</span><span class="p">)</span> +<span class="p">{</span> + <span class="n">g_free</span> <span class="p">(</span><span class="n">data</span><span class="p">);</span> +<span class="p">}</span> -<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span> -<span class="function">my_path_set_data</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">CoglPath</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">path</span><span class="symbol">,</span><span class="normal"> </span><span class="type">void</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">data</span><span class="symbol">)</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="function"><a href="cogl-General-API.html#cogl-object-set-user-data">cogl_object_set_user_data</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">COGL_OBJECT</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">path</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">private_key</span><span class="symbol">,</span> -<span class="normal"> data</span><span class="symbol">,</span> -<span class="normal"> destroy_path_private_cb</span><span class="symbol">);</span> -<span class="cbracket">}</span></pre></td> +<span class="k">static</span> <span class="kt">void</span> +<span class="nf">my_path_set_data</span> <span class="p">(</span><span class="n">CoglPath</span> <span class="o">*</span><span class="n">path</span><span class="p">,</span> <span class="kt">void</span> <span class="o">*</span><span class="n">data</span><span class="p">)</span> +<span class="p">{</span> + <span class="n">cogl_object_set_user_data</span> <span class="p">(</span><span class="n">COGL_OBJECT</span> <span class="p">(</span><span class="n">path</span><span class="p">),</span> + <span class="o">&</span><span class="n">private_key</span><span class="p">,</span> + <span class="n">data</span><span class="p">,</span> + <span class="n">destroy_path_private_cb</span><span class="p">);</span> +<span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -2181,8 +2181,8 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-PIXEL-FORMAT-RG-88:CAPS"></a>COGL_PIXEL_FORMAT_RG_88</p></td> <td class="enum_member_description"> <p>RG, 16 bits. Note that red-green textures - are only available if <code class="literal">COGL_FEATURE_ID_TEXTURE_RG</code> is advertised. - See <code class="function">cogl_texture_set_components()</code> for details.</p> +are only available if <code class="literal">COGL_FEATURE_ID_TEXTURE_RG</code> is advertised. +See <code class="function">cogl_texture_set_components()</code> for details.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2441,7 +2441,7 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-ATTRIBUTE-TYPE-UNSIGNED-BYTE:CAPS"></a>COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE</p></td> <td class="enum_member_description"> <p>Data is the same size of an - unsigned byte</p> +unsigned byte</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2456,7 +2456,7 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-ATTRIBUTE-TYPE-UNSIGNED-SHORT:CAPS"></a>COGL_ATTRIBUTE_TYPE_UNSIGNED_SHORT</p></td> <td class="enum_member_description"> <p>Data is the same size of - an unsigned short integer</p> +an unsigned short integer</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2496,9 +2496,9 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-FEATURE-TEXTURE-NPOT:CAPS"></a>COGL_FEATURE_TEXTURE_NPOT</p></td> <td class="enum_member_description"> <p>Non power of two textures are supported - by the hardware. This is a equivalent to the - <a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-BASIC:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_BASIC</code></a>, <a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-MIPMAP:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_MIPMAP</code></a> - and <a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-REPEAT:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_REPEAT</code></a> features combined.</p> +by the hardware. This is a equivalent to the +<a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-BASIC:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_BASIC</code></a>, <a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-MIPMAP:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_MIPMAP</code></a> +and <a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-REPEAT:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_REPEAT</code></a> features combined.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2576,8 +2576,8 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-FEATURE-UNSIGNED-INT-INDICES:CAPS"></a>COGL_FEATURE_UNSIGNED_INT_INDICES</p></td> <td class="enum_member_description"> <p>Set if - <a class="link" href="cogl-Vertex-Buffers.html#COGL-INDICES-TYPE-UNSIGNED-INT:CAPS"><code class="literal">COGL_INDICES_TYPE_UNSIGNED_INT</code></a> is supported in - <a class="link" href="cogl-Vertex-Buffers.html#cogl-vertex-buffer-indices-new" title="cogl_vertex_buffer_indices_new ()"><code class="function">cogl_vertex_buffer_indices_new()</code></a>.</p> +<a class="link" href="cogl-Vertex-Buffers.html#COGL-INDICES-TYPE-UNSIGNED-INT:CAPS"><code class="literal">COGL_INDICES_TYPE_UNSIGNED_INT</code></a> is supported in +<a class="link" href="cogl-Vertex-Buffers.html#cogl-vertex-buffer-indices-new" title="cogl_vertex_buffer_indices_new ()"><code class="function">cogl_vertex_buffer_indices_new()</code></a>.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2592,11 +2592,11 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-FEATURE-TEXTURE-NPOT-BASIC:CAPS"></a>COGL_FEATURE_TEXTURE_NPOT_BASIC</p></td> <td class="enum_member_description"> <p>The hardware supports non power - of two textures, but you also need to check the - <a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-MIPMAP:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_MIPMAP</code></a> and <a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-REPEAT:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_REPEAT</code></a> - features to know if the hardware supports npot texture mipmaps - or repeat modes other than - <code class="literal">COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE</code> respectively.</p> +of two textures, but you also need to check the +<a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-MIPMAP:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_MIPMAP</code></a> and <a class="link" href="cogl-General-API.html#COGL-FEATURE-TEXTURE-NPOT-REPEAT:CAPS"><code class="literal">COGL_FEATURE_TEXTURE_NPOT_REPEAT</code></a> +features to know if the hardware supports npot texture mipmaps +or repeat modes other than +<code class="literal">COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE</code> respectively.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2604,7 +2604,7 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-FEATURE-TEXTURE-NPOT-MIPMAP:CAPS"></a>COGL_FEATURE_TEXTURE_NPOT_MIPMAP</p></td> <td class="enum_member_description"> <p>Mipmapping is supported in - conjuntion with non power of two textures.</p> +conjuntion with non power of two textures.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2612,8 +2612,8 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-FEATURE-TEXTURE-NPOT-REPEAT:CAPS"></a>COGL_FEATURE_TEXTURE_NPOT_REPEAT</p></td> <td class="enum_member_description"> <p>Repeat modes other than - <code class="literal">COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE</code> are supported by the - hardware.</p> +<code class="literal">COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE</code> are supported by the +hardware.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2621,7 +2621,7 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-FEATURE-POINT-SPRITE:CAPS"></a>COGL_FEATURE_POINT_SPRITE</p></td> <td class="enum_member_description"> <p>Whether - <a class="link" href="cogl-Materials.html#cogl-material-set-layer-point-sprite-coords-enabled" title="cogl_material_set_layer_point_sprite_coords_enabled ()"><code class="function">cogl_material_set_layer_point_sprite_coords_enabled()</code></a> is supported.</p> +<a class="link" href="cogl-Materials.html#cogl-material-set-layer-point-sprite-coords-enabled" title="cogl_material_set_layer_point_sprite_coords_enabled ()"><code class="function">cogl_material_set_layer_point_sprite_coords_enabled()</code></a> is supported.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2643,7 +2643,7 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-FEATURE-MAP-BUFFER-FOR-READ:CAPS"></a>COGL_FEATURE_MAP_BUFFER_FOR_READ</p></td> <td class="enum_member_description"> <p>Whether <a class="link" href="cogl-Buffers.html#cogl-buffer-map" title="cogl_buffer_map ()"><code class="function">cogl_buffer_map()</code></a> is - supported with CoglBufferAccess including read support.</p> +supported with CoglBufferAccess including read support.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2651,7 +2651,7 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-FEATURE-MAP-BUFFER-FOR-WRITE:CAPS"></a>COGL_FEATURE_MAP_BUFFER_FOR_WRITE</p></td> <td class="enum_member_description"> <p>Whether <a class="link" href="cogl-Buffers.html#cogl-buffer-map" title="cogl_buffer_map ()"><code class="function">cogl_buffer_map()</code></a> is - supported with CoglBufferAccess including write support.</p> +supported with CoglBufferAccess including write support.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2664,7 +2664,7 @@ internally and convert the texture data if necessary.</p> <td class="enum_member_name"><p><a name="COGL-FEATURE-DEPTH-TEXTURE:CAPS"></a>COGL_FEATURE_DEPTH_TEXTURE</p></td> <td class="enum_member_description"> <p>Whether <span class="type">CoglFramebuffer</span> support rendering the - depth buffer to a texture.</p> +depth buffer to a texture.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2684,7 +2684,7 @@ determines f as:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">f </span><span class="symbol">=</span><span class="normal"> end </span><span class="symbol">-</span><span class="normal"> eye_distance </span><span class="symbol">/</span><span class="normal"> end </span><span class="symbol">-</span><span class="normal"> start</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">f</span> <span class="o">=</span> <span class="n">end</span> <span class="o">-</span> <span class="n">eye_distance</span> <span class="o">/</span> <span class="n">end</span> <span class="o">-</span> <span class="n">start</span></pre></td> </tr> </tbody> </table> @@ -2711,7 +2711,7 @@ coordinates from the origin.</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">f </span><span class="symbol">=</span><span class="normal"> end </span><span class="symbol">-</span><span class="normal"> eye_distance </span><span class="symbol">/</span><span class="normal"> end </span><span class="symbol">-</span><span class="normal"> start</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">f</span> <span class="o">=</span> <span class="n">end</span> <span class="o">-</span> <span class="n">eye_distance</span> <span class="o">/</span> <span class="n">end</span> <span class="o">-</span> <span class="n">start</span></pre></td> </tr> </tbody> </table> @@ -2730,7 +2730,7 @@ coordinates from the origin.</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">f </span><span class="symbol">=</span><span class="normal"> e </span><span class="symbol">^</span><span class="normal"> </span><span class="symbol">-(</span><span class="normal">density </span><span class="symbol">*</span><span class="normal"> eye_distance</span><span class="symbol">)</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">f</span> <span class="o">=</span> <span class="n">e</span> <span class="o">^</span> <span class="o">-</span><span class="p">(</span><span class="n">density</span> <span class="o">*</span> <span class="n">eye_distance</span><span class="p">)</span></pre></td> </tr> </tbody> </table> @@ -2749,7 +2749,7 @@ coordinates from the origin.</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">f </span><span class="symbol">=</span><span class="normal"> e </span><span class="symbol">^</span><span class="normal"> </span><span class="symbol">-(</span><span class="normal">density </span><span class="symbol">*</span><span class="normal"> eye_distance</span><span class="symbol">)^</span><span class="number">2</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">f</span> <span class="o">=</span> <span class="n">e</span> <span class="o">^</span> <span class="o">-</span><span class="p">(</span><span class="n">density</span> <span class="o">*</span> <span class="n">eye_distance</span><span class="p">)</span><span class="o">^</span><span class="mi">2</span></pre></td> </tr> </tbody> </table> @@ -2790,6 +2790,6 @@ coordinates from the origin.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Materials-(Deprecated).html b/doc/reference/cogl/html/cogl-Materials-(Deprecated).html index 3dca94c0..83b460bf 100644 --- a/doc/reference/cogl/html/cogl-Materials-(Deprecated).html +++ b/doc/reference/cogl/html/cogl-Materials-(Deprecated).html @@ -8,7 +8,7 @@ <link rel="up" href="ch03.html" title="Cogl deprecated API"> <link rel="prev" href="cogl-Textures-(Deprecated).html" title="Textures (Deprecated)"> <link rel="next" href="cogl-Clipping-(Deprecated).html" title="Clipping (Deprecated)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Materials-(Deprecated).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -171,11 +171,8 @@ should not be modified or freed. </p> </div> </div> </div> -<div class="refsect1"> -<a name="cogl-Materials-(Deprecated).other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Materials.html b/doc/reference/cogl/html/cogl-Materials.html index 87a44887..6d5cfdad 100644 --- a/doc/reference/cogl/html/cogl-Materials.html +++ b/doc/reference/cogl/html/cogl-Materials.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Blend-Strings.html" title="Material Blend Strings"> <link rel="next" href="cogl-Primitives.html" title="Primitives"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Materials.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -430,8 +430,8 @@ <a name="cogl-Materials.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -1273,7 +1273,7 @@ blend statements will be of the form:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol"><</span><span class="normal">channel</span><span class="symbol">-</span><span class="normal">mask</span><span class="symbol">>=</span><span class="function">ADD</span><span class="symbol">(</span><span class="normal">SRC_COLOR</span><span class="symbol">*(<</span><span class="normal">factor</span><span class="symbol">>),</span><span class="normal"> DST_COLOR</span><span class="symbol">*(<</span><span class="normal">factor</span><span class="symbol">>))</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="o"><</span><span class="n">channel</span><span class="o">-</span><span class="n">mask</span><span class="o">>=</span><span class="n">ADD</span><span class="p">(</span><span class="n">SRC_COLOR</span><span class="o">*</span><span class="p">(</span><span class="o"><</span><span class="n">factor</span><span class="o">></span><span class="p">),</span> <span class="n">DST_COLOR</span><span class="o">*</span><span class="p">(</span><span class="o"><</span><span class="n">factor</span><span class="o">></span><span class="p">))</span></pre></td> </tr> </tbody> </table> @@ -1327,7 +1327,7 @@ before computing the result of blending.</div> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">RGBA </span><span class="symbol">=</span><span class="normal"> </span><span class="function">ADD</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SRC_COLOR</span><span class="symbol">,</span><span class="normal"> DST_COLOR</span><span class="symbol">*(</span><span class="number">1</span><span class="symbol">-</span><span class="normal">SRC_COLOR</span><span class="symbol">[</span><span class="normal">A</span><span class="symbol">]))</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">RGBA</span> <span class="o">=</span> <span class="n">ADD</span> <span class="p">(</span><span class="n">SRC_COLOR</span><span class="p">,</span> <span class="n">DST_COLOR</span><span class="o">*</span><span class="p">(</span><span class="mi">1</span><span class="o">-</span><span class="n">SRC_COLOR</span><span class="p">[</span><span class="n">A</span><span class="p">]))</span></pre></td> </tr> </tbody> </table> @@ -1651,7 +1651,7 @@ are:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">RGBA </span><span class="symbol">=</span><span class="normal"> </span><span class="function">MODULATE</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">PREVIOUS</span><span class="symbol">,</span><span class="normal"> TEXTURE</span><span class="symbol">)</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">RGBA</span> <span class="o">=</span> <span class="n">MODULATE</span> <span class="p">(</span><span class="n">PREVIOUS</span><span class="p">,</span> <span class="n">TEXTURE</span><span class="p">)</span></pre></td> </tr> </tbody> </table> @@ -1665,7 +1665,7 @@ are:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">RGBA </span><span class="symbol">=</span><span class="normal"> </span><span class="function">INTERPOLATE</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">PREVIOUS</span><span class="symbol">,</span><span class="normal"> TEXTURE</span><span class="symbol">,</span><span class="normal"> CONSTANT</span><span class="symbol">[</span><span class="normal">A</span><span class="symbol">])</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">RGBA</span> <span class="o">=</span> <span class="n">INTERPOLATE</span> <span class="p">(</span><span class="n">PREVIOUS</span><span class="p">,</span> <span class="n">TEXTURE</span><span class="p">,</span> <span class="n">CONSTANT</span><span class="p">[</span><span class="n">A</span><span class="p">])</span></pre></td> </tr> </tbody> </table> @@ -2457,26 +2457,26 @@ program with a <a class="link" href="cogl-Materials.html#CoglMaterial" title="Co 18 19 20</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="usertype">CoglHandle</span><span class="normal"> shader</span><span class="symbol">;</span> -<span class="usertype">CoglHandle</span><span class="normal"> program</span><span class="symbol">;</span> -<span class="usertype">CoglMaterial</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">material</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="n">CoglHandle</span> <span class="n">shader</span><span class="p">;</span> +<span class="n">CoglHandle</span> <span class="n">program</span><span class="p">;</span> +<span class="n">CoglMaterial</span> <span class="o">*</span><span class="n">material</span><span class="p">;</span> -<span class="normal">shader </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-Shaders-and-Programmable-Pipeline.html#cogl-create-shader">cogl_create_shader</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="cogl-Shaders-and-Programmable-Pipeline.html#COGL-SHADER-TYPE-FRAGMENT:CAPS">COGL_SHADER_TYPE_FRAGMENT</a></span><span class="symbol">);</span> -<span class="function"><a href="cogl-Shaders-and-Programmable-Pipeline.html#cogl-shader-source">cogl_shader_source</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">shader</span><span class="symbol">,</span> -<span class="normal"> </span><span class="string">"!!ARBfp1.0</span><span class="specialchar">\n</span><span class="string">"</span> -<span class="normal"> </span><span class="string">"MOV result.color,fragment.color;</span><span class="specialchar">\n</span><span class="string">"</span> -<span class="normal"> </span><span class="string">"END</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">);</span> -<span class="function"><a href="cogl-Shaders-and-Programmable-Pipeline.html#cogl-shader-compile">cogl_shader_compile</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">shader</span><span class="symbol">);</span> +<span class="n">shader</span> <span class="o">=</span> <span class="n">cogl_create_shader</span> <span class="p">(</span><span class="n">COGL_SHADER_TYPE_FRAGMENT</span><span class="p">);</span> +<span class="n">cogl_shader_source</span> <span class="p">(</span><span class="n">shader</span><span class="p">,</span> + <span class="s">"!!ARBfp1.0</span><span class="se">\n</span><span class="s">"</span> + <span class="s">"MOV result.color,fragment.color;</span><span class="se">\n</span><span class="s">"</span> + <span class="s">"END</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span> +<span class="n">cogl_shader_compile</span> <span class="p">(</span><span class="n">shader</span><span class="p">);</span> -<span class="normal">program </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-Shaders-and-Programmable-Pipeline.html#cogl-create-program">cogl_create_program</a></span><span class="normal"> </span><span class="symbol">();</span> -<span class="function"><a href="cogl-Shaders-and-Programmable-Pipeline.html#cogl-program-attach-shader">cogl_program_attach_shader</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">program</span><span class="symbol">,</span><span class="normal"> shader</span><span class="symbol">);</span> -<span class="function"><a href="cogl-Shaders-and-Programmable-Pipeline.html#cogl-program-link">cogl_program_link</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">program</span><span class="symbol">);</span> +<span class="n">program</span> <span class="o">=</span> <span class="n">cogl_create_program</span> <span class="p">();</span> +<span class="n">cogl_program_attach_shader</span> <span class="p">(</span><span class="n">program</span><span class="p">,</span> <span class="n">shader</span><span class="p">);</span> +<span class="n">cogl_program_link</span> <span class="p">(</span><span class="n">program</span><span class="p">);</span> -<span class="normal">material </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="cogl-Materials.html#cogl-material-new">cogl_material_new</a></span><span class="normal"> </span><span class="symbol">();</span> -<span class="function"><a href="cogl-Materials.html#cogl-material-set-user-program">cogl_material_set_user_program</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">material</span><span class="symbol">,</span><span class="normal"> program</span><span class="symbol">);</span> +<span class="n">material</span> <span class="o">=</span> <span class="n">cogl_material_new</span> <span class="p">();</span> +<span class="n">cogl_material_set_user_program</span> <span class="p">(</span><span class="n">material</span><span class="p">,</span> <span class="n">program</span><span class="p">);</span> -<span class="function"><a href="cogl-General-API.html#cogl-set-source-color4ub">cogl_set_source_color4ub</a></span><span class="normal"> </span><span class="symbol">(</span><span class="number">0xff</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xff</span><span class="symbol">);</span> -<span class="function"><a href="cogl-Primitives.html#cogl-rectangle">cogl_rectangle</a></span><span class="normal"> </span><span class="symbol">(</span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">100</span><span class="symbol">,</span><span class="normal"> </span><span class="number">100</span><span class="symbol">);</span></pre></td> +<span class="n">cogl_set_source_color4ub</span> <span class="p">(</span><span class="mh">0xff</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0x00</span><span class="p">,</span> <span class="mh">0xff</span><span class="p">);</span> +<span class="n">cogl_rectangle</span> <span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">100</span><span class="p">,</span> <span class="mi">100</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -2647,7 +2647,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-ALPHA-FUNC-LESS:CAPS"></a>COGL_MATERIAL_ALPHA_FUNC_LESS</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value is less than the reference alpha value</p> +alpha value is less than the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2655,7 +2655,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-ALPHA-FUNC-EQUAL:CAPS"></a>COGL_MATERIAL_ALPHA_FUNC_EQUAL</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value equals the reference alpha value</p> +alpha value equals the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2663,7 +2663,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-ALPHA-FUNC-LEQUAL:CAPS"></a>COGL_MATERIAL_ALPHA_FUNC_LEQUAL</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value is less than or equal to the reference alpha value</p> +alpha value is less than or equal to the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2671,7 +2671,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-ALPHA-FUNC-GREATER:CAPS"></a>COGL_MATERIAL_ALPHA_FUNC_GREATER</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value is greater than the reference alpha value</p> +alpha value is greater than the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2679,7 +2679,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-ALPHA-FUNC-NOTEQUAL:CAPS"></a>COGL_MATERIAL_ALPHA_FUNC_NOTEQUAL</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value does not equal the reference alpha value</p> +alpha value does not equal the reference alpha value</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2687,7 +2687,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-ALPHA-FUNC-GEQUAL:CAPS"></a>COGL_MATERIAL_ALPHA_FUNC_GEQUAL</p></td> <td class="enum_member_description"> <p>Let the fragment through if the incoming - alpha value is greater than or equal to the reference alpha value.</p> +alpha value is greater than or equal to the reference alpha value.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2748,7 +2748,7 @@ determines how the comparison is done.</p> <td class="enum_member_name"><p><a name="COGL-BLEND-STRING-ERROR-GPU-UNSUPPORTED-ERROR:CAPS"></a>COGL_BLEND_STRING_ERROR_GPU_UNSUPPORTED_ERROR</p></td> <td class="enum_member_description"> <p>Blend string not - supported by the GPU</p> +supported by the GPU</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2778,7 +2778,7 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-FILTER-NEAREST:CAPS"></a>COGL_MATERIAL_FILTER_NEAREST</p></td> <td class="enum_member_description"> <p>Measuring in manhatten distance from the, - current pixel center, use the nearest texture texel</p> +current pixel center, use the nearest texture texel</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2786,7 +2786,7 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-FILTER-LINEAR:CAPS"></a>COGL_MATERIAL_FILTER_LINEAR</p></td> <td class="enum_member_description"> <p>Use the weighted average of the 4 texels - nearest the current pixel center</p> +nearest the current pixel center</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2794,8 +2794,8 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-FILTER-NEAREST-MIPMAP-NEAREST:CAPS"></a>COGL_MATERIAL_FILTER_NEAREST_MIPMAP_NEAREST</p></td> <td class="enum_member_description"> <p>Select the mimap level whose - texel size most closely matches the current pixel, and use the - <a class="link" href="cogl-Materials.html#COGL-MATERIAL-FILTER-NEAREST:CAPS"><code class="literal">COGL_MATERIAL_FILTER_NEAREST</code></a> criterion</p> +texel size most closely matches the current pixel, and use the +<a class="link" href="cogl-Materials.html#COGL-MATERIAL-FILTER-NEAREST:CAPS"><code class="literal">COGL_MATERIAL_FILTER_NEAREST</code></a> criterion</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2803,8 +2803,8 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-FILTER-LINEAR-MIPMAP-NEAREST:CAPS"></a>COGL_MATERIAL_FILTER_LINEAR_MIPMAP_NEAREST</p></td> <td class="enum_member_description"> <p>Select the mimap level whose - texel size most closely matches the current pixel, and use the - <a class="link" href="cogl-Materials.html#COGL-MATERIAL-FILTER-LINEAR:CAPS"><code class="literal">COGL_MATERIAL_FILTER_LINEAR</code></a> criterion</p> +texel size most closely matches the current pixel, and use the +<a class="link" href="cogl-Materials.html#COGL-MATERIAL-FILTER-LINEAR:CAPS"><code class="literal">COGL_MATERIAL_FILTER_LINEAR</code></a> criterion</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2812,9 +2812,9 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-FILTER-NEAREST-MIPMAP-LINEAR:CAPS"></a>COGL_MATERIAL_FILTER_NEAREST_MIPMAP_LINEAR</p></td> <td class="enum_member_description"> <p>Select the two mimap levels - whose texel size most closely matches the current pixel, use - the <a class="link" href="cogl-Materials.html#COGL-MATERIAL-FILTER-NEAREST:CAPS"><code class="literal">COGL_MATERIAL_FILTER_NEAREST</code></a> criterion on each one and take - their weighted average</p> +whose texel size most closely matches the current pixel, use +the <a class="link" href="cogl-Materials.html#COGL-MATERIAL-FILTER-NEAREST:CAPS"><code class="literal">COGL_MATERIAL_FILTER_NEAREST</code></a> criterion on each one and take +their weighted average</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2822,9 +2822,9 @@ average or simply using the nearest texel.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-FILTER-LINEAR-MIPMAP-LINEAR:CAPS"></a>COGL_MATERIAL_FILTER_LINEAR_MIPMAP_LINEAR</p></td> <td class="enum_member_description"> <p>Select the two mimap levels - whose texel size most closely matches the current pixel, use - the <a class="link" href="cogl-Materials.html#COGL-MATERIAL-FILTER-LINEAR:CAPS"><code class="literal">COGL_MATERIAL_FILTER_LINEAR</code></a> criterion on each one and take - their weighted average</p> +whose texel size most closely matches the current pixel, use +the <a class="link" href="cogl-Materials.html#COGL-MATERIAL-FILTER-LINEAR:CAPS"><code class="literal">COGL_MATERIAL_FILTER_LINEAR</code></a> criterion on each one and take +their weighted average</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2881,7 +2881,7 @@ merged in if the wrap mode is set to repeat.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-WRAP-MODE-REPEAT:CAPS"></a>COGL_MATERIAL_WRAP_MODE_REPEAT</p></td> <td class="enum_member_description"> <p>The texture will be repeated. This - is useful for example to draw a tiled background.</p> +is useful for example to draw a tiled background.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2889,9 +2889,9 @@ merged in if the wrap mode is set to repeat.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-WRAP-MODE-CLAMP-TO-EDGE:CAPS"></a>COGL_MATERIAL_WRAP_MODE_CLAMP_TO_EDGE</p></td> <td class="enum_member_description"> <p>The coordinates outside the - range 0→1 will sample copies of the edge pixels of the - texture. This is useful to avoid artifacts if only one copy of - the texture is being rendered.</p> +range 0→1 will sample copies of the edge pixels of the +texture. This is useful to avoid artifacts if only one copy of +the texture is being rendered.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2899,13 +2899,13 @@ merged in if the wrap mode is set to repeat.</p> <td class="enum_member_name"><p><a name="COGL-MATERIAL-WRAP-MODE-AUTOMATIC:CAPS"></a>COGL_MATERIAL_WRAP_MODE_AUTOMATIC</p></td> <td class="enum_member_description"> <p>Cogl will try to automatically - decide which of the above two to use. For <a class="link" href="cogl-Primitives.html#cogl-rectangle" title="cogl_rectangle ()"><code class="function">cogl_rectangle()</code></a>, it - will use repeat mode if any of the texture coordinates are - outside the range 0→1, otherwise it will use clamp to edge. For - <a class="link" href="cogl-Primitives.html#cogl-polygon" title="cogl_polygon ()"><code class="function">cogl_polygon()</code></a> it will always use repeat mode. For - <a class="link" href="cogl-Vertex-Buffers.html#cogl-vertex-buffer-draw" title="cogl_vertex_buffer_draw ()"><code class="function">cogl_vertex_buffer_draw()</code></a> it will use repeat mode except for - layers that have point sprite coordinate generation enabled. This - is the default value.</p> +decide which of the above two to use. For <a class="link" href="cogl-Primitives.html#cogl-rectangle" title="cogl_rectangle ()"><code class="function">cogl_rectangle()</code></a>, it +will use repeat mode if any of the texture coordinates are +outside the range 0→1, otherwise it will use clamp to edge. For +<a class="link" href="cogl-Primitives.html#cogl-polygon" title="cogl_polygon ()"><code class="function">cogl_polygon()</code></a> it will always use repeat mode. For +<a class="link" href="cogl-Vertex-Buffers.html#cogl-vertex-buffer-draw" title="cogl_vertex_buffer_draw ()"><code class="function">cogl_vertex_buffer_draw()</code></a> it will use repeat mode except for +layers that have point sprite coordinate generation enabled. This +is the default value.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2917,6 +2917,6 @@ merged in if the wrap mode is set to repeat.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Matrices.html b/doc/reference/cogl/html/cogl-Matrices.html index 0c74aed0..63d35f48 100644 --- a/doc/reference/cogl/html/cogl-Matrices.html +++ b/doc/reference/cogl/html/cogl-Matrices.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Vertex-Buffers.html" title="Vertex Buffers"> <link rel="next" href="cogl-Shaders-and-Programmable-Pipeline.html" title="Shaders and Programmable Pipeline"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Matrices.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -197,8 +197,8 @@ <a name="cogl-Matrices.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">Â </td> @@ -227,10 +227,10 @@ cogl_matrix_init_identity (<em class="parameter"><code><a class="link" href="cog 2 3 4</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol">.</span><span class="normal">xx</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">xy</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">xz</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">xw</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span> -<span class="symbol">.</span><span class="normal">yx</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">yy</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">yz</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">yw</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span> -<span class="symbol">.</span><span class="normal">zx</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">zy</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">zz</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">zw</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span> -<span class="symbol">.</span><span class="normal">wx</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">wy</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">wz</span><span class="symbol">=</span><span class="number">0</span><span class="symbol">;</span><span class="normal"> </span><span class="symbol">.</span><span class="normal">ww</span><span class="symbol">=</span><span class="number">1</span><span class="symbol">;</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">.</span><span class="n">xx</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span> <span class="p">.</span><span class="n">xy</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">xz</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">xw</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> +<span class="p">.</span><span class="n">yx</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">yy</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span> <span class="p">.</span><span class="n">yz</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">yw</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> +<span class="p">.</span><span class="n">zx</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">zy</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">zz</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span> <span class="p">.</span><span class="n">zw</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> +<span class="p">.</span><span class="n">wx</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">wy</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">wz</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span> <span class="p">.</span><span class="n">ww</span><span class="o">=</span><span class="mi">1</span><span class="p">;</span></pre></td> </tr> </tbody> </table> @@ -930,29 +930,29 @@ the input array to do the transform in-place.</p> 21 22 23</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">typedef</span><span class="normal"> </span><span class="keyword">struct</span><span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal">y</span><span class="symbol">;</span> -<span class="normal"> </span><span class="usertype">uint8_t</span><span class="normal"> r</span><span class="symbol">,</span><span class="normal">g</span><span class="symbol">,</span><span class="normal">b</span><span class="symbol">,</span><span class="normal">a</span><span class="symbol">;</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> s</span><span class="symbol">,</span><span class="normal">t</span><span class="symbol">,</span><span class="normal">p</span><span class="symbol">;</span> -<span class="cbracket">}</span><span class="normal"> MyInVertex</span><span class="symbol">;</span> -<span class="keyword">typedef</span><span class="normal"> </span><span class="keyword">struct</span><span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="usertype">uint8_t</span><span class="normal"> r</span><span class="symbol">,</span><span class="normal">g</span><span class="symbol">,</span><span class="normal">b</span><span class="symbol">,</span><span class="normal">a</span><span class="symbol">;</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal">y</span><span class="symbol">,</span><span class="normal">z</span><span class="symbol">;</span> -<span class="cbracket">}</span><span class="normal"> MyOutVertex</span><span class="symbol">;</span> -<span class="usertype">MyInVertex</span><span class="normal"> vertices</span><span class="symbol">[</span><span class="normal">N_VERTICES</span><span class="symbol">];</span> -<span class="usertype">MyOutVertex</span><span class="normal"> results</span><span class="symbol">[</span><span class="normal">N_VERTICES</span><span class="symbol">];</span> -<span class="usertype">CoglMatrix</span><span class="normal"> matrix</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="k">typedef</span> <span class="k">struct</span> <span class="p">{</span> + <span class="kt">float</span> <span class="n">x</span><span class="p">,</span><span class="n">y</span><span class="p">;</span> + <span class="kt">uint8_t</span> <span class="n">r</span><span class="p">,</span><span class="n">g</span><span class="p">,</span><span class="n">b</span><span class="p">,</span><span class="n">a</span><span class="p">;</span> + <span class="kt">float</span> <span class="n">s</span><span class="p">,</span><span class="n">t</span><span class="p">,</span><span class="n">p</span><span class="p">;</span> +<span class="p">}</span> <span class="n">MyInVertex</span><span class="p">;</span> +<span class="k">typedef</span> <span class="k">struct</span> <span class="p">{</span> + <span class="kt">uint8_t</span> <span class="n">r</span><span class="p">,</span><span class="n">g</span><span class="p">,</span><span class="n">b</span><span class="p">,</span><span class="n">a</span><span class="p">;</span> + <span class="kt">float</span> <span class="n">x</span><span class="p">,</span><span class="n">y</span><span class="p">,</span><span class="n">z</span><span class="p">;</span> +<span class="p">}</span> <span class="n">MyOutVertex</span><span class="p">;</span> +<span class="n">MyInVertex</span> <span class="n">vertices</span><span class="p">[</span><span class="n">N_VERTICES</span><span class="p">];</span> +<span class="n">MyOutVertex</span> <span class="n">results</span><span class="p">[</span><span class="n">N_VERTICES</span><span class="p">];</span> +<span class="n">CoglMatrix</span> <span class="n">matrix</span><span class="p">;</span> -<span class="function">my_load_vertices</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">vertices</span><span class="symbol">);</span> -<span class="function">my_get_matrix</span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">matrix</span><span class="symbol">);</span> +<span class="n">my_load_vertices</span> <span class="p">(</span><span class="n">vertices</span><span class="p">);</span> +<span class="n">my_get_matrix</span> <span class="p">(</span><span class="o">&</span><span class="n">matrix</span><span class="p">);</span> -<span class="function"><a href="cogl-Matrices.html#cogl-matrix-project-points">cogl_matrix_project_points</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">matrix</span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">2</span><span class="symbol">,</span> -<span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyInVertex</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">vertices</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">].</span><span class="normal">x</span><span class="symbol">,</span> -<span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyOutVertex</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">results</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">].</span><span class="normal">x</span><span class="symbol">,</span> -<span class="normal"> N_VERTICES</span><span class="symbol">);</span></pre></td> +<span class="n">cogl_matrix_project_points</span> <span class="p">(</span><span class="o">&</span><span class="n">matrix</span><span class="p">,</span> + <span class="mi">2</span><span class="p">,</span> + <span class="k">sizeof</span> <span class="p">(</span><span class="n">MyInVertex</span><span class="p">),</span> + <span class="o">&</span><span class="n">vertices</span><span class="p">[</span><span class="mi">0</span><span class="p">].</span><span class="n">x</span><span class="p">,</span> + <span class="k">sizeof</span> <span class="p">(</span><span class="n">MyOutVertex</span><span class="p">),</span> + <span class="o">&</span><span class="n">results</span><span class="p">[</span><span class="mi">0</span><span class="p">].</span><span class="n">x</span><span class="p">,</span> + <span class="n">N_VERTICES</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -1068,29 +1068,29 @@ transform in-place.</p> 21 22 23</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">typedef</span><span class="normal"> </span><span class="keyword">struct</span><span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal">y</span><span class="symbol">;</span> -<span class="normal"> </span><span class="usertype">uint8_t</span><span class="normal"> r</span><span class="symbol">,</span><span class="normal">g</span><span class="symbol">,</span><span class="normal">b</span><span class="symbol">,</span><span class="normal">a</span><span class="symbol">;</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> s</span><span class="symbol">,</span><span class="normal">t</span><span class="symbol">,</span><span class="normal">p</span><span class="symbol">;</span> -<span class="cbracket">}</span><span class="normal"> MyInVertex</span><span class="symbol">;</span> -<span class="keyword">typedef</span><span class="normal"> </span><span class="keyword">struct</span><span class="normal"> </span><span class="cbracket">{</span> -<span class="normal"> </span><span class="usertype">uint8_t</span><span class="normal"> r</span><span class="symbol">,</span><span class="normal">g</span><span class="symbol">,</span><span class="normal">b</span><span class="symbol">,</span><span class="normal">a</span><span class="symbol">;</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal">y</span><span class="symbol">,</span><span class="normal">z</span><span class="symbol">;</span> -<span class="cbracket">}</span><span class="normal"> MyOutVertex</span><span class="symbol">;</span> -<span class="usertype">MyInVertex</span><span class="normal"> vertices</span><span class="symbol">[</span><span class="normal">N_VERTICES</span><span class="symbol">];</span> -<span class="usertype">MyOutVertex</span><span class="normal"> results</span><span class="symbol">[</span><span class="normal">N_VERTICES</span><span class="symbol">];</span> -<span class="usertype">CoglMatrix</span><span class="normal"> matrix</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="k">typedef</span> <span class="k">struct</span> <span class="p">{</span> + <span class="kt">float</span> <span class="n">x</span><span class="p">,</span><span class="n">y</span><span class="p">;</span> + <span class="kt">uint8_t</span> <span class="n">r</span><span class="p">,</span><span class="n">g</span><span class="p">,</span><span class="n">b</span><span class="p">,</span><span class="n">a</span><span class="p">;</span> + <span class="kt">float</span> <span class="n">s</span><span class="p">,</span><span class="n">t</span><span class="p">,</span><span class="n">p</span><span class="p">;</span> +<span class="p">}</span> <span class="n">MyInVertex</span><span class="p">;</span> +<span class="k">typedef</span> <span class="k">struct</span> <span class="p">{</span> + <span class="kt">uint8_t</span> <span class="n">r</span><span class="p">,</span><span class="n">g</span><span class="p">,</span><span class="n">b</span><span class="p">,</span><span class="n">a</span><span class="p">;</span> + <span class="kt">float</span> <span class="n">x</span><span class="p">,</span><span class="n">y</span><span class="p">,</span><span class="n">z</span><span class="p">;</span> +<span class="p">}</span> <span class="n">MyOutVertex</span><span class="p">;</span> +<span class="n">MyInVertex</span> <span class="n">vertices</span><span class="p">[</span><span class="n">N_VERTICES</span><span class="p">];</span> +<span class="n">MyOutVertex</span> <span class="n">results</span><span class="p">[</span><span class="n">N_VERTICES</span><span class="p">];</span> +<span class="n">CoglMatrix</span> <span class="n">matrix</span><span class="p">;</span> -<span class="function">my_load_vertices</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">vertices</span><span class="symbol">);</span> -<span class="function">my_get_matrix</span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">matrix</span><span class="symbol">);</span> +<span class="n">my_load_vertices</span> <span class="p">(</span><span class="n">vertices</span><span class="p">);</span> +<span class="n">my_get_matrix</span> <span class="p">(</span><span class="o">&</span><span class="n">matrix</span><span class="p">);</span> -<span class="function"><a href="cogl-Matrices.html#cogl-matrix-transform-points">cogl_matrix_transform_points</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">matrix</span><span class="symbol">,</span> -<span class="normal"> </span><span class="number">2</span><span class="symbol">,</span> -<span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyInVertex</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">vertices</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">].</span><span class="normal">x</span><span class="symbol">,</span> -<span class="normal"> </span><span class="keyword">sizeof</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyOutVertex</span><span class="symbol">),</span> -<span class="normal"> </span><span class="symbol">&</span><span class="normal">results</span><span class="symbol">[</span><span class="number">0</span><span class="symbol">].</span><span class="normal">x</span><span class="symbol">,</span> -<span class="normal"> N_VERTICES</span><span class="symbol">);</span></pre></td> +<span class="n">cogl_matrix_transform_points</span> <span class="p">(</span><span class="o">&</span><span class="n">matrix</span><span class="p">,</span> + <span class="mi">2</span><span class="p">,</span> + <span class="k">sizeof</span> <span class="p">(</span><span class="n">MyInVertex</span><span class="p">),</span> + <span class="o">&</span><span class="n">vertices</span><span class="p">[</span><span class="mi">0</span><span class="p">].</span><span class="n">x</span><span class="p">,</span> + <span class="k">sizeof</span> <span class="p">(</span><span class="n">MyOutVertex</span><span class="p">),</span> + <span class="o">&</span><span class="n">results</span><span class="p">[</span><span class="mi">0</span><span class="p">].</span><span class="n">x</span><span class="p">,</span> + <span class="n">N_VERTICES</span><span class="p">);</span></pre></td> </tr> </tbody> </table> @@ -1234,10 +1234,10 @@ applied.</p> 2 3 4</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">x_new </span><span class="symbol">=</span><span class="normal"> xx </span><span class="symbol">*</span><span class="normal"> x </span><span class="symbol">+</span><span class="normal"> xy </span><span class="symbol">*</span><span class="normal"> y </span><span class="symbol">+</span><span class="normal"> xz </span><span class="symbol">*</span><span class="normal"> z </span><span class="symbol">+</span><span class="normal"> xw </span><span class="symbol">*</span><span class="normal"> w</span> -<span class="normal">y_new </span><span class="symbol">=</span><span class="normal"> yx </span><span class="symbol">*</span><span class="normal"> x </span><span class="symbol">+</span><span class="normal"> yy </span><span class="symbol">*</span><span class="normal"> y </span><span class="symbol">+</span><span class="normal"> yz </span><span class="symbol">*</span><span class="normal"> z </span><span class="symbol">+</span><span class="normal"> yw </span><span class="symbol">*</span><span class="normal"> w</span> -<span class="normal">z_new </span><span class="symbol">=</span><span class="normal"> zx </span><span class="symbol">*</span><span class="normal"> x </span><span class="symbol">+</span><span class="normal"> zy </span><span class="symbol">*</span><span class="normal"> y </span><span class="symbol">+</span><span class="normal"> zz </span><span class="symbol">*</span><span class="normal"> z </span><span class="symbol">+</span><span class="normal"> zw </span><span class="symbol">*</span><span class="normal"> w</span> -<span class="normal">w_new </span><span class="symbol">=</span><span class="normal"> wx </span><span class="symbol">*</span><span class="normal"> x </span><span class="symbol">+</span><span class="normal"> wy </span><span class="symbol">*</span><span class="normal"> y </span><span class="symbol">+</span><span class="normal"> wz </span><span class="symbol">*</span><span class="normal"> z </span><span class="symbol">+</span><span class="normal"> ww </span><span class="symbol">*</span><span class="normal"> w</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">x_new</span> <span class="o">=</span> <span class="n">xx</span> <span class="o">*</span> <span class="n">x</span> <span class="o">+</span> <span class="n">xy</span> <span class="o">*</span> <span class="n">y</span> <span class="o">+</span> <span class="n">xz</span> <span class="o">*</span> <span class="n">z</span> <span class="o">+</span> <span class="n">xw</span> <span class="o">*</span> <span class="n">w</span> +<span class="n">y_new</span> <span class="o">=</span> <span class="n">yx</span> <span class="o">*</span> <span class="n">x</span> <span class="o">+</span> <span class="n">yy</span> <span class="o">*</span> <span class="n">y</span> <span class="o">+</span> <span class="n">yz</span> <span class="o">*</span> <span class="n">z</span> <span class="o">+</span> <span class="n">yw</span> <span class="o">*</span> <span class="n">w</span> +<span class="n">z_new</span> <span class="o">=</span> <span class="n">zx</span> <span class="o">*</span> <span class="n">x</span> <span class="o">+</span> <span class="n">zy</span> <span class="o">*</span> <span class="n">y</span> <span class="o">+</span> <span class="n">zz</span> <span class="o">*</span> <span class="n">z</span> <span class="o">+</span> <span class="n">zw</span> <span class="o">*</span> <span class="n">w</span> +<span class="n">w_new</span> <span class="o">=</span> <span class="n">wx</span> <span class="o">*</span> <span class="n">x</span> <span class="o">+</span> <span class="n">wy</span> <span class="o">*</span> <span class="n">y</span> <span class="o">+</span> <span class="n">wz</span> <span class="o">*</span> <span class="n">z</span> <span class="o">+</span> <span class="n">ww</span> <span class="o">*</span> <span class="n">w</span></pre></td> </tr> </tbody> </table> @@ -1254,6 +1254,6 @@ than the identity matrix you can use <a class="link" href="cogl-Matrices.html#co </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Offscreen-Buffers-(Deprecated).html b/doc/reference/cogl/html/cogl-Offscreen-Buffers-(Deprecated).html index a72109c6..d48e1a63 100644 --- a/doc/reference/cogl/html/cogl-Offscreen-Buffers-(Deprecated).html +++ b/doc/reference/cogl/html/cogl-Offscreen-Buffers-(Deprecated).html @@ -8,7 +8,7 @@ <link rel="up" href="ch03.html" title="Cogl deprecated API"> <link rel="prev" href="cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html" title="Shaders and Programmable Pipeline (Deprecated)"> <link rel="next" href="coglglossary.html" title="Glossaries"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Offscreen-Buffers-(Deprecated).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -125,11 +125,8 @@ the count reaches 0.</p> </div> </div> </div> -<div class="refsect1"> -<a name="cogl-Offscreen-Buffers-(Deprecated).other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Offscreen-Buffers.html b/doc/reference/cogl/html/cogl-Offscreen-Buffers.html index 1201df9a..e300a8a7 100644 --- a/doc/reference/cogl/html/cogl-Offscreen-Buffers.html +++ b/doc/reference/cogl/html/cogl-Offscreen-Buffers.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Shaders-and-Programmable-Pipeline.html" title="Shaders and Programmable Pipeline"> <link rel="next" href="cogl-Bitmaps.html" title="Bitmaps"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-Offscreen-Buffers.top_of_page"></a>Offscreen Buffers</span></h2> <p>Offscreen Buffers — Functions for creating and manipulating offscreen - framebuffers.</p> +framebuffers.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-Offscreen-Buffers.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -353,49 +353,49 @@ corresponding to the bottom right you can do so like this:</p> 41 42 43</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="type">void</span> -<span class="function">setup_viewport</span><span class="normal"> </span><span class="symbol">(</span><span class="type">unsigned</span><span class="normal"> </span><span class="type">int</span><span class="normal"> width</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">unsigned</span><span class="normal"> </span><span class="type">int</span><span class="normal"> height</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> fovy</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> aspect</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> z_near</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> z_far</span><span class="symbol">)</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="type">float</span><span class="normal"> z_camera</span><span class="symbol">;</span> -<span class="normal"> </span><span class="usertype">CoglMatrix</span><span class="normal"> projection_matrix</span><span class="symbol">;</span> -<span class="normal"> </span><span class="usertype">CoglMatrix</span><span class="normal"> mv_matrix</span><span class="symbol">;</span> + <td class="listing_code"><pre class="programlisting"><span class="k">static</span> <span class="kt">void</span> +<span class="nf">setup_viewport</span> <span class="p">(</span><span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">width</span><span class="p">,</span> + <span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">height</span><span class="p">,</span> + <span class="kt">float</span> <span class="n">fovy</span><span class="p">,</span> + <span class="kt">float</span> <span class="n">aspect</span><span class="p">,</span> + <span class="kt">float</span> <span class="n">z_near</span><span class="p">,</span> + <span class="kt">float</span> <span class="n">z_far</span><span class="p">)</span> +<span class="p">{</span> + <span class="kt">float</span> <span class="n">z_camera</span><span class="p">;</span> + <span class="n">CoglMatrix</span> <span class="n">projection_matrix</span><span class="p">;</span> + <span class="n">CoglMatrix</span> <span class="n">mv_matrix</span><span class="p">;</span> -<span class="normal"> </span><span class="function"><a href="cogl-General-API.html#cogl-set-viewport">cogl_set_viewport</a></span><span class="normal"> </span><span class="symbol">(</span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-General-API.html#cogl-perspective">cogl_perspective</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">fovy</span><span class="symbol">,</span><span class="normal"> aspect</span><span class="symbol">,</span><span class="normal"> z_near</span><span class="symbol">,</span><span class="normal"> z_far</span><span class="symbol">);</span> + <span class="n">cogl_set_viewport</span> <span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">width</span><span class="p">,</span> <span class="n">height</span><span class="p">);</span> + <span class="n">cogl_perspective</span> <span class="p">(</span><span class="n">fovy</span><span class="p">,</span> <span class="n">aspect</span><span class="p">,</span> <span class="n">z_near</span><span class="p">,</span> <span class="n">z_far</span><span class="p">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-General-API.html#cogl-get-projection-matrix">cogl_get_projection_matrix</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">projection_matrix</span><span class="symbol">);</span> -<span class="normal"> z_camera </span><span class="symbol">=</span><span class="normal"> </span><span class="number">0.5</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> projection_matrix</span><span class="symbol">.</span><span class="normal">xx</span><span class="symbol">;</span> + <span class="n">cogl_get_projection_matrix</span> <span class="p">(</span><span class="o">&</span><span class="n">projection_matrix</span><span class="p">);</span> + <span class="n">z_camera</span> <span class="o">=</span> <span class="mf">0.5</span> <span class="o">*</span> <span class="n">projection_matrix</span><span class="p">.</span><span class="n">xx</span><span class="p">;</span> -<span class="normal"> </span><span class="function"><a href="cogl-Matrices.html#cogl-matrix-init-identity">cogl_matrix_init_identity</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-Matrices.html#cogl-matrix-translate">cogl_matrix_translate</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">0</span><span class="symbol">.</span><span class="normal">5f</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">0</span><span class="symbol">.</span><span class="normal">5f</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="normal">z_camera</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-Matrices.html#cogl-matrix-scale">cogl_matrix_scale</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">.</span><span class="normal">0f </span><span class="symbol">/</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">1</span><span class="symbol">.</span><span class="normal">0f </span><span class="symbol">/</span><span class="normal"> height</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">.</span><span class="normal">0f </span><span class="symbol">/</span><span class="normal"> width</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-Matrices.html#cogl-matrix-translate">cogl_matrix_translate</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">.</span><span class="normal">0f</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">-</span><span class="number">1.0</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> height</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">.</span><span class="normal">0f</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-General-API.html#cogl-set-modelview-matrix">cogl_set_modelview_matrix</a></span><span class="normal"> </span><span class="symbol">(&</span><span class="normal">mv_matrix</span><span class="symbol">);</span> -<span class="cbracket">}</span> + <span class="n">cogl_matrix_init_identity</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">);</span> + <span class="n">cogl_matrix_translate</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">,</span> <span class="o">-</span><span class="mf">0.5f</span><span class="p">,</span> <span class="o">-</span><span class="mf">0.5f</span><span class="p">,</span> <span class="o">-</span><span class="n">z_camera</span><span class="p">);</span> + <span class="n">cogl_matrix_scale</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">,</span> <span class="mf">1.0f</span> <span class="o">/</span> <span class="n">width</span><span class="p">,</span> <span class="o">-</span><span class="mf">1.0f</span> <span class="o">/</span> <span class="n">height</span><span class="p">,</span> <span class="mf">1.0f</span> <span class="o">/</span> <span class="n">width</span><span class="p">);</span> + <span class="n">cogl_matrix_translate</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">,</span> <span class="mf">0.0f</span><span class="p">,</span> <span class="o">-</span><span class="mf">1.0</span> <span class="o">*</span> <span class="n">height</span><span class="p">,</span> <span class="mf">0.0f</span><span class="p">);</span> + <span class="n">cogl_set_modelview_matrix</span> <span class="p">(</span><span class="o">&</span><span class="n">mv_matrix</span><span class="p">);</span> +<span class="p">}</span> -<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span> -<span class="function">my_init_framebuffer</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">ClutterStage</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">stage</span><span class="symbol">,</span> -<span class="normal"> </span><span class="usertype">CoglFramebuffer</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">framebuffer</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">unsigned</span><span class="normal"> </span><span class="type">int</span><span class="normal"> framebuffer_width</span><span class="symbol">,</span> -<span class="normal"> </span><span class="type">unsigned</span><span class="normal"> </span><span class="type">int</span><span class="normal"> framebuffer_height</span><span class="symbol">)</span> -<span class="cbracket">{</span> -<span class="normal"> </span><span class="usertype">ClutterPerspective</span><span class="normal"> perspective</span><span class="symbol">;</span> +<span class="k">static</span> <span class="kt">void</span> +<span class="nf">my_init_framebuffer</span> <span class="p">(</span><span class="n">ClutterStage</span> <span class="o">*</span><span class="n">stage</span><span class="p">,</span> + <span class="n">CoglFramebuffer</span> <span class="o">*</span><span class="n">framebuffer</span><span class="p">,</span> + <span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">framebuffer_width</span><span class="p">,</span> + <span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">framebuffer_height</span><span class="p">)</span> +<span class="p">{</span> + <span class="n">ClutterPerspective</span> <span class="n">perspective</span><span class="p">;</span> -<span class="normal"> </span><span class="function">clutter_stage_get_perspective</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">stage</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&</span><span class="normal">perspective</span><span class="symbol">);</span> + <span class="n">clutter_stage_get_perspective</span> <span class="p">(</span><span class="n">stage</span><span class="p">,</span> <span class="o">&</span><span class="n">perspective</span><span class="p">);</span> -<span class="normal"> </span><span class="function"><a href="cogl-Offscreen-Buffers.html#cogl-push-framebuffer">cogl_push_framebuffer</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">framebuffer</span><span class="symbol">);</span> -<span class="normal"> </span><span class="function">setup_viewport</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">framebuffer_width</span><span class="symbol">,</span> -<span class="normal"> framebuffer_height</span><span class="symbol">,</span> -<span class="normal"> perspective</span><span class="symbol">.</span><span class="normal">fovy</span><span class="symbol">,</span> -<span class="normal"> perspective</span><span class="symbol">.</span><span class="normal">aspect</span><span class="symbol">,</span> -<span class="normal"> perspective</span><span class="symbol">.</span><span class="normal">z_near</span><span class="symbol">,</span> -<span class="normal"> perspective</span><span class="symbol">.</span><span class="normal">z_far</span><span class="symbol">);</span> -<span class="cbracket">}</span></pre></td> + <span class="n">cogl_push_framebuffer</span> <span class="p">(</span><span class="n">framebuffer</span><span class="p">);</span> + <span class="n">setup_viewport</span> <span class="p">(</span><span class="n">framebuffer_width</span><span class="p">,</span> + <span class="n">framebuffer_height</span><span class="p">,</span> + <span class="n">perspective</span><span class="p">.</span><span class="n">fovy</span><span class="p">,</span> + <span class="n">perspective</span><span class="p">.</span><span class="n">aspect</span><span class="p">,</span> + <span class="n">perspective</span><span class="p">.</span><span class="n">z_near</span><span class="p">,</span> + <span class="n">perspective</span><span class="p">.</span><span class="n">z_far</span><span class="p">);</span> +<span class="p">}</span></pre></td> </tr> </tbody> </table> @@ -503,11 +503,8 @@ cogl_push_draw_buffer (<em class="parameter"><code><span class="type">void</span <p>Save <a class="link" href="cogl-Offscreen-Buffers.html#cogl-set-draw-buffer" title="cogl_set_draw_buffer ()"><code class="function">cogl_set_draw_buffer()</code></a> state.</p> </div> </div> -<div class="refsect1"> -<a name="cogl-Offscreen-Buffers.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Path-Primitives.html b/doc/reference/cogl/html/cogl-Path-Primitives.html index 0b781110..13b650f5 100644 --- a/doc/reference/cogl/html/cogl-Path-Primitives.html +++ b/doc/reference/cogl/html/cogl-Path-Primitives.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Primitives.html" title="Primitives"> <link rel="next" href="cogl-Clipping.html" title="Clipping"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -38,11 +38,8 @@ <a name="cogl-Path-Primitives.functions_details"></a><h2>Functions</h2> <p></p> </div> -<div class="refsect1"> -<a name="cogl-Path-Primitives.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Primitives.html b/doc/reference/cogl/html/cogl-Primitives.html index 12ae2703..7d8006dc 100644 --- a/doc/reference/cogl/html/cogl-Primitives.html +++ b/doc/reference/cogl/html/cogl-Primitives.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Materials.html" title="Materials"> <link rel="next" href="cogl-Path-Primitives.html" title="Path Primitives"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Primitives.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -411,11 +411,8 @@ to COGL_MATERIAL_FILTER_NEAREST.</p> <p class="since">Since: <a class="link" href="ix04.html#api-index-1.0">1.0</a></p> </div> </div> -<div class="refsect1"> -<a name="cogl-Primitives.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Quaternions-(Rotations).html b/doc/reference/cogl/html/cogl-Quaternions-(Rotations).html index 46c71635..011df6d3 100644 --- a/doc/reference/cogl/html/cogl-Quaternions-(Rotations).html +++ b/doc/reference/cogl/html/cogl-Quaternions-(Rotations).html @@ -8,7 +8,7 @@ <link rel="up" href="ch02.html" title="Cogl experimental API"> <link rel="prev" href="cogl-3D-textures.html" title="3D textures"> <link rel="next" href="ch03.html" title="Cogl deprecated API"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -36,8 +36,8 @@ quaternions.</p> <a name="cogl-Quaternions-(Rotations).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -221,8 +221,8 @@ quaternions.</p> <a name="cogl-Quaternions-(Rotations).other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword"> </td> @@ -1050,7 +1050,7 @@ pair are represented in a quaternion as follows:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol">[</span><span class="normal">w</span><span class="symbol">=</span><span class="function">cos</span><span class="symbol">(</span><span class="normal">ðœƒ</span><span class="symbol">/</span><span class="number">2</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"> x</span><span class="symbol">=</span><span class="function">sin</span><span class="symbol">(</span><span class="normal">ðœƒ</span><span class="symbol">/</span><span class="number">2</span><span class="symbol">)*</span><span class="normal">a</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">=</span><span class="function">sin</span><span class="symbol">(</span><span class="normal">ðœƒ</span><span class="symbol">/</span><span class="number">2</span><span class="symbol">)*</span><span class="normal">a</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">,</span><span class="normal"> z</span><span class="symbol">=</span><span class="function">sin</span><span class="symbol">(</span><span class="normal">ðœƒ</span><span class="symbol">/</span><span class="number">2</span><span class="symbol">)*</span><span class="normal">a</span><span class="symbol">.</span><span class="normal">x </span><span class="symbol">)]</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">[</span><span class="n">w</span><span class="o">=</span><span class="n">cos</span><span class="p">(</span><span class="err">ðœƒ</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span> <span class="p">(</span> <span class="n">x</span><span class="o">=</span><span class="n">sin</span><span class="p">(</span><span class="err">ðœƒ</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span><span class="o">*</span><span class="n">a</span><span class="p">.</span><span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="o">=</span><span class="n">sin</span><span class="p">(</span><span class="err">ðœƒ</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span><span class="o">*</span><span class="n">a</span><span class="p">.</span><span class="n">y</span><span class="p">,</span> <span class="n">z</span><span class="o">=</span><span class="n">sin</span><span class="p">(</span><span class="err">ðœƒ</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span><span class="o">*</span><span class="n">a</span><span class="p">.</span><span class="n">x</span> <span class="p">)]</span></pre></td> </tr> </tbody> </table> @@ -1066,7 +1066,7 @@ magnitude of a quaternion is defined as:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function">sqrt</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">w² </span><span class="symbol">+</span><span class="normal"> x² </span><span class="symbol">+</span><span class="normal"> y² </span><span class="symbol">+</span><span class="normal"> z²</span><span class="symbol">)</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">sqrt</span> <span class="p">(</span><span class="n">w²</span> <span class="o">+</span> <span class="n">x²</span> <span class="o">+</span> <span class="n">y²</span> <span class="o">+</span> <span class="n">z²</span><span class="p">)</span></pre></td> </tr> </tbody> </table> @@ -1079,7 +1079,7 @@ and a unit quaternion satisfies this equation:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="normal">w² </span><span class="symbol">+</span><span class="normal"> x² </span><span class="symbol">+</span><span class="normal"> y² </span><span class="symbol">+</span><span class="normal"> z² </span><span class="symbol">=</span><span class="normal"> </span><span class="number">1</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="n">w²</span> <span class="o">+</span> <span class="n">x²</span> <span class="o">+</span> <span class="n">y²</span> <span class="o">+</span> <span class="n">z²</span> <span class="o">=</span> <span class="mi">1</span></pre></td> </tr> </tbody> </table> @@ -1139,6 +1139,6 @@ rotation it is sin(ðœƒ/2)*axis.z</p></td> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html b/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html index 261af4b2..dfe0aef1 100644 --- a/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html +++ b/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html @@ -8,7 +8,7 @@ <link rel="up" href="ch03.html" title="Cogl deprecated API"> <link rel="prev" href="cogl-Vertex-Buffers-(Deprecated).html" title="Vertex Buffers (Deprecated)"> <link rel="next" href="cogl-Offscreen-Buffers-(Deprecated).html" title="Offscreen Buffers (Deprecated)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Shaders-and-Programmable-Pipeline-(Deprecated).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -494,11 +494,8 @@ parameter is used to determine the square size of the matrix.</p> </div> </div> </div> -<div class="refsect1"> -<a name="cogl-Shaders-and-Programmable-Pipeline-(Deprecated).other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html b/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html index 35b23dd2..a2cc4656 100644 --- a/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html +++ b/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Matrices.html" title="Matrices"> <link rel="next" href="cogl-Offscreen-Buffers.html" title="Offscreen Buffers"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Shaders-and-Programmable-Pipeline.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -182,8 +182,8 @@ <a name="cogl-Shaders-and-Programmable-Pipeline.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody><tr> <td class="datatype_keyword">enum</td> @@ -1004,6 +1004,6 @@ pass 1</p></td> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Textures-(Deprecated).html b/doc/reference/cogl/html/cogl-Textures-(Deprecated).html index 6e0bb3ae..b83aae1c 100644 --- a/doc/reference/cogl/html/cogl-Textures-(Deprecated).html +++ b/doc/reference/cogl/html/cogl-Textures-(Deprecated).html @@ -8,7 +8,7 @@ <link rel="up" href="ch03.html" title="Cogl deprecated API"> <link rel="prev" href="cogl-General-API-(Deprecated).html" title="General API (Deprecated)"> <link rel="next" href="cogl-Materials-(Deprecated).html" title="Materials (Deprecated)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Textures-(Deprecated).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -122,11 +122,8 @@ cogl_texture_unref (<em class="parameter"><code><span class="type">void</span> * </div> </div> </div> -<div class="refsect1"> -<a name="cogl-Textures-(Deprecated).other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Textures.html b/doc/reference/cogl/html/cogl-Textures.html index 0ae35749..6afddad4 100644 --- a/doc/reference/cogl/html/cogl-Textures.html +++ b/doc/reference/cogl/html/cogl-Textures.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Color-Type.html" title="Color Type"> <link rel="next" href="cogl-Blend-Strings.html" title="Material Blend Strings"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Textures.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -171,8 +171,8 @@ <a name="cogl-Textures.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -1068,10 +1068,10 @@ use_color is <code class="literal">FALSE</code> when calling <a class="link" hre <td class="enum_member_name"><p><a name="COGL-TEXTURE-NO-AUTO-MIPMAP:CAPS"></a>COGL_TEXTURE_NO_AUTO_MIPMAP</p></td> <td class="enum_member_description"> <p>Disables the automatic generation of - the mipmap pyramid from the base level image whenever it is - updated. The mipmaps are only generated when the texture is - rendered with a mipmap filter so it should be free to leave out - this flag when using other filtering modes</p> +the mipmap pyramid from the base level image whenever it is +updated. The mipmaps are only generated when the texture is +rendered with a mipmap filter so it should be free to leave out +this flag when using other filtering modes</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -1086,7 +1086,7 @@ use_color is <code class="literal">FALSE</code> when calling <a class="link" hre <td class="enum_member_name"><p><a name="COGL-TEXTURE-NO-ATLAS:CAPS"></a>COGL_TEXTURE_NO_ATLAS</p></td> <td class="enum_member_description"> <p>Disables the insertion of the texture inside - the texture atlas used by Cogl</p> +the texture atlas used by Cogl</p> </td> <td class="enum_member_annotations">Â </td> </tr> @@ -1098,6 +1098,6 @@ use_color is <code class="literal">FALSE</code> when calling <a class="link" hre </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Vectors.html b/doc/reference/cogl/html/cogl-Vectors.html index a4a33bd3..0ef2e4fb 100644 --- a/doc/reference/cogl/html/cogl-Vectors.html +++ b/doc/reference/cogl/html/cogl-Vectors.html @@ -8,7 +8,7 @@ <link rel="up" href="ch02.html" title="Cogl experimental API"> <link rel="prev" href="cogl-Buffers.html" title="Buffers"> <link rel="next" href="cogl-3D-textures.html" title="3D textures"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-Vectors.top_of_page"></a>Vectors</span></h2> <p>Vectors — Functions for handling single precision float - vectors.</p> +vectors.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-Vectors.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -345,7 +345,7 @@ comparing the floats.</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function">fabsf</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">vector0</span><span class="symbol">-></span><span class="normal">x </span><span class="symbol">-</span><span class="normal"> vector1</span><span class="symbol">-></span><span class="normal">x</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol"><</span><span class="normal"> epsilon</span><span class="symbol">)</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="k">if</span> <span class="p">(</span><span class="n">fabsf</span> <span class="p">(</span><span class="n">vector0</span><span class="o">-></span><span class="n">x</span> <span class="o">-</span> <span class="n">vector1</span><span class="o">-></span><span class="n">x</span><span class="p">)</span> <span class="o"><</span> <span class="n">epsilon</span><span class="p">)</span></pre></td> </tr> </tbody> </table> @@ -908,7 +908,7 @@ of the normal</div> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol">(</span><span class="normal">a</span><span class="symbol">-></span><span class="normal">x </span><span class="symbol">*</span><span class="normal"> b</span><span class="symbol">-></span><span class="normal">x </span><span class="symbol">+</span><span class="normal"> a</span><span class="symbol">-></span><span class="normal">y </span><span class="symbol">*</span><span class="normal"> b</span><span class="symbol">-></span><span class="normal">y </span><span class="symbol">+</span><span class="normal"> a</span><span class="symbol">-></span><span class="normal">z </span><span class="symbol">*</span><span class="normal"> b</span><span class="symbol">-></span><span class="normal">z</span><span class="symbol">)</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="p">(</span><span class="n">a</span><span class="o">-></span><span class="n">x</span> <span class="o">*</span> <span class="n">b</span><span class="o">-></span><span class="n">x</span> <span class="o">+</span> <span class="n">a</span><span class="o">-></span><span class="n">y</span> <span class="o">*</span> <span class="n">b</span><span class="o">-></span><span class="n">y</span> <span class="o">+</span> <span class="n">a</span><span class="o">-></span><span class="n">z</span> <span class="o">*</span> <span class="n">b</span><span class="o">-></span><span class="n">z</span><span class="p">)</span></pre></td> </tr> </tbody> </table> @@ -922,7 +922,7 @@ angle between two vectors as:</p> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="symbol">|</span><span class="normal">a</span><span class="symbol">||</span><span class="normal">b</span><span class="symbol">|</span><span class="normal">cosðœƒ</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="o">|</span><span class="n">a</span><span class="o">||</span><span class="n">b</span><span class="o">|</span><span class="n">cosðœƒ</span></pre></td> </tr> </tbody> </table> @@ -1023,11 +1023,8 @@ mentioned in the release notes for the affected release. "><span class="acronym">Unstable</span></acronym></p> </div> </div> -<div class="refsect1"> -<a name="cogl-Vectors.other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Vertex-Buffers-(Deprecated).html b/doc/reference/cogl/html/cogl-Vertex-Buffers-(Deprecated).html index 43e856e8..f600ef4c 100644 --- a/doc/reference/cogl/html/cogl-Vertex-Buffers-(Deprecated).html +++ b/doc/reference/cogl/html/cogl-Vertex-Buffers-(Deprecated).html @@ -8,7 +8,7 @@ <link rel="up" href="ch03.html" title="Cogl deprecated API"> <link rel="prev" href="cogl-Clipping-(Deprecated).html" title="Clipping (Deprecated)"> <link rel="next" href="cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html" title="Shaders and Programmable Pipeline (Deprecated)"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,8 +35,8 @@ <a name="cogl-Vertex-Buffers-(Deprecated).functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -122,11 +122,8 @@ cogl_vertex_buffer_unref (<em class="parameter"><code><a class="link" href="cogl </div> </div> </div> -<div class="refsect1"> -<a name="cogl-Vertex-Buffers-(Deprecated).other_details"></a><h2>Types and Values</h2> -</div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/cogl-Vertex-Buffers.html b/doc/reference/cogl/html/cogl-Vertex-Buffers.html index 6203aa9e..050cdb36 100644 --- a/doc/reference/cogl/html/cogl-Vertex-Buffers.html +++ b/doc/reference/cogl/html/cogl-Vertex-Buffers.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Cogl - a modern 3D graphics API"> <link rel="prev" href="cogl-Clipping.html" title="Clipping"> <link rel="next" href="cogl-Matrices.html" title="Matrices"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,7 +28,7 @@ <td valign="top"> <h2><span class="refentrytitle"><a name="cogl-Vertex-Buffers.top_of_page"></a>Vertex Buffers</span></h2> <p>Vertex Buffers — An API for submitting extensible arrays of vertex - attributes to be mapped into the GPU for fast drawing.</p> +attributes to be mapped into the GPU for fast drawing.</p> </td> <td class="gallery_image" valign="top" align="right"></td> </tr></table></div> @@ -36,8 +36,8 @@ <a name="cogl-Vertex-Buffers.functions"></a><h2>Functions</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="functions_return"> -<col class="functions_name"> +<col width="150px" class="functions_proto_type"> +<col class="functions_proto_name"> </colgroup> <tbody> <tr> @@ -150,8 +150,8 @@ <a name="cogl-Vertex-Buffers.other"></a><h2>Types and Values</h2> <div class="informaltable"><table class="informaltable" width="100%" border="0"> <colgroup> -<col width="150px" class="name"> -<col class="description"> +<col width="150px" class="other_proto_type"> +<col class="other_proto_name"> </colgroup> <tbody> <tr> @@ -326,7 +326,7 @@ built-in names: (Note: they correspond to the built-in names of GLSL)</p> <li class="listitem">"gl_MultiTexCoord0, gl_MultiTexCoord1, ..."</li> <li class="listitem">"gl_Vertex"</li> </ul></div> -<p> To support adding multiple variations of the same attribute the name +<p>To support adding multiple variations of the same attribute the name can have a detail component, E.g. "gl_Color::active" or "gl_Color::inactive"</p> </td> @@ -925,6 +925,6 @@ advertized.</p> </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/coglglossary.html b/doc/reference/cogl/html/coglglossary.html index 80ec0582..c37f87a9 100644 --- a/doc/reference/cogl/html/coglglossary.html +++ b/doc/reference/cogl/html/coglglossary.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl Reference Manual"> <link rel="prev" href="cogl-Offscreen-Buffers-(Deprecated).html" title="Offscreen Buffers (Deprecated)"> <link rel="next" href="ix01.html" title="Index of all symbols"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -69,6 +69,6 @@ mentioned in the release notes for the affected release. </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/index.html b/doc/reference/cogl/html/index.html index f9e32c96..357479eb 100644 --- a/doc/reference/cogl/html/index.html +++ b/doc/reference/cogl/html/index.html @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="Cogl Reference Manual"> <link rel="next" href="ch01.html" title="Cogl - a modern 3D graphics API"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -14,7 +14,7 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Cogl Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">for Cogl 1.22.6</p></div> +<div><p class="releaseinfo">for Cogl 1.22.8</p></div> <div><p class="copyright">Copyright © 2008 OpenedHand LTD</p></div> <div><p class="copyright">Copyright © 2009, 2010 Intel Corporation</p></div> <div><div class="legalnotice"> @@ -73,7 +73,7 @@ combining functions.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-Vertex-Buffers.html">Vertex Buffers</a></span><span class="refpurpose"> — An API for submitting extensible arrays of vertex - attributes to be mapped into the GPU for fast drawing.</span> +attributes to be mapped into the GPU for fast drawing.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-Matrices.html">Matrices</a></span><span class="refpurpose"> — Functions for initializing and manipulating 4x4 matrices</span> @@ -83,7 +83,7 @@ combining functions.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-Offscreen-Buffers.html">Offscreen Buffers</a></span><span class="refpurpose"> — Functions for creating and manipulating offscreen - framebuffers.</span> +framebuffers.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-Bitmaps.html">Bitmaps</a></span><span class="refpurpose"> — Functions for loading images</span> @@ -103,7 +103,7 @@ combining functions.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-Vectors.html">Vectors</a></span><span class="refpurpose"> — Functions for handling single precision float - vectors.</span> +vectors.</span> </dt> <dt> <span class="refentrytitle"><a href="cogl-3D-textures.html">3D textures</a></span><span class="refpurpose"> — Functions for creating and manipulating 3D textures</span> @@ -145,6 +145,6 @@ quaternions.</span> </dl></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/ix01.html b/doc/reference/cogl/html/ix01.html index 55d1bf48..2d0b059f 100644 --- a/doc/reference/cogl/html/ix01.html +++ b/doc/reference/cogl/html/ix01.html @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Cogl Reference Manual"> <link rel="prev" href="coglglossary.html" title="Glossaries"> <link rel="next" href="ix02.html" title="Index of deprecated symbols"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -1712,6 +1712,6 @@ cogl_texture_2d_new_with_size, function in 2D textures <dd></dd> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/license.html b/doc/reference/cogl/html/license.html index c86a8158..93055c69 100644 --- a/doc/reference/cogl/html/license.html +++ b/doc/reference/cogl/html/license.html @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="Cogl Reference Manual"> <link rel="up" href="index.html" title="Cogl Reference Manual"> <link rel="prev" href="ix08.html" title="Index of new symbols in 1.8"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -52,6 +52,6 @@ </p> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.32.1</div> </body> </html>
\ No newline at end of file diff --git a/doc/reference/cogl/html/style.css b/doc/reference/cogl/html/style.css index 4be4ede1..b4a1493b 100644 --- a/doc/reference/cogl/html/style.css +++ b/doc/reference/cogl/html/style.css @@ -293,29 +293,11 @@ h2 .extralinks, h3 .extralinks font-weight: normal; } -acronym,abbr +acronym,abbr { border-bottom: 1px dotted gray; } -/* code listings */ - -.listing_code .programlisting .normal, -.listing_code .programlisting .normal a, -.listing_code .programlisting .number, -.listing_code .programlisting .cbracket, -.listing_code .programlisting .symbol { color: #555753; } -.listing_code .programlisting .comment, -.listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ -.listing_code .programlisting .function, -.listing_code .programlisting .function a, -.listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ -.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */ -.listing_code .programlisting .keyword, -.listing_code .programlisting .usertype, -.listing_code .programlisting .type, -.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */ - .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; @@ -481,3 +463,71 @@ acronym,abbr } } +.hll { background-color: #ffffcc } +.c { color: #408080; font-style: italic } /* Comment */ +.err { border: 1px solid #FF0000 } /* Error */ +.k { color: #008000; font-weight: bold } /* Keyword */ +.o { color: #666666 } /* Operator */ +.ch { color: #408080; font-style: italic } /* Comment.Hashbang */ +.cm { color: #408080; font-style: italic } /* Comment.Multiline */ +.cp { color: #BC7A00 } /* Comment.Preproc */ +.cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ +.c1 { color: #408080; font-style: italic } /* Comment.Single */ +.cs { color: #408080; font-style: italic } /* Comment.Special */ +.gd { color: #A00000 } /* Generic.Deleted */ +.ge { font-style: italic } /* Generic.Emph */ +.gr { color: #FF0000 } /* Generic.Error */ +.gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.gi { color: #00A000 } /* Generic.Inserted */ +.go { color: #888888 } /* Generic.Output */ +.gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.gs { font-weight: bold } /* Generic.Strong */ +.gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.gt { color: #0044DD } /* Generic.Traceback */ +.kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +.kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +.kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +.kp { color: #008000 } /* Keyword.Pseudo */ +.kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +.kt { color: #B00040 } /* Keyword.Type */ +.m { color: #666666 } /* Literal.Number */ +.s { color: #BA2121 } /* Literal.String */ +.na { color: #7D9029 } /* Name.Attribute */ +.nb { color: #008000 } /* Name.Builtin */ +.nc { color: #0000FF; font-weight: bold } /* Name.Class */ +.no { color: #880000 } /* Name.Constant */ +.nd { color: #AA22FF } /* Name.Decorator */ +.ni { color: #999999; font-weight: bold } /* Name.Entity */ +.ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.nf { color: #0000FF } /* Name.Function */ +.nl { color: #A0A000 } /* Name.Label */ +.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.nt { color: #008000; font-weight: bold } /* Name.Tag */ +.nv { color: #19177C } /* Name.Variable */ +.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.w { color: #bbbbbb } /* Text.Whitespace */ +.mb { color: #666666 } /* Literal.Number.Bin */ +.mf { color: #666666 } /* Literal.Number.Float */ +.mh { color: #666666 } /* Literal.Number.Hex */ +.mi { color: #666666 } /* Literal.Number.Integer */ +.mo { color: #666666 } /* Literal.Number.Oct */ +.sa { color: #BA2121 } /* Literal.String.Affix */ +.sb { color: #BA2121 } /* Literal.String.Backtick */ +.sc { color: #BA2121 } /* Literal.String.Char */ +.dl { color: #BA2121 } /* Literal.String.Delimiter */ +.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +.s2 { color: #BA2121 } /* Literal.String.Double */ +.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.sh { color: #BA2121 } /* Literal.String.Heredoc */ +.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.sx { color: #008000 } /* Literal.String.Other */ +.sr { color: #BB6688 } /* Literal.String.Regex */ +.s1 { color: #BA2121 } /* Literal.String.Single */ +.ss { color: #19177C } /* Literal.String.Symbol */ +.bp { color: #008000 } /* Name.Builtin.Pseudo */ +.fm { color: #0000FF } /* Name.Function.Magic */ +.vc { color: #19177C } /* Name.Variable.Class */ +.vg { color: #19177C } /* Name.Variable.Global */ +.vi { color: #19177C } /* Name.Variable.Instance */ +.vm { color: #19177C } /* Name.Variable.Magic */ +.il { color: #666666 } /* Literal.Number.Integer.Long */
\ No newline at end of file Binary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differdiff --git a/po/ca@valencia.gmo b/po/ca@valencia.gmo Binary files differindex 6553d875..4fef5e6e 100644 --- a/po/ca@valencia.gmo +++ b/po/ca@valencia.gmo diff --git a/po/cogl.pot b/po/cogl.pot index 4011522a..d6a80590 100644 --- a/po/cogl.pot +++ b/po/cogl.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: cogl 1.22.6\n" +"Project-Id-Version: cogl 1.22.8\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/cogl/issues\n" -"POT-Creation-Date: 2020-03-09 16:04+0000\n" +"POT-Creation-Date: 2020-06-04 13:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" Binary files differBinary files differBinary files differBinary files differdiff --git a/po/en_CA.gmo b/po/en_CA.gmo Binary files differindex 682df03c..76e60524 100644 --- a/po/en_CA.gmo +++ b/po/en_CA.gmo diff --git a/po/en_GB.gmo b/po/en_GB.gmo Binary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differindex 7f73add8..b0479729 100644 --- a/po/en_GB.gmo +++ b/po/en_GB.gmo diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differBinary files differBinary files differBinary files differBinary files differBinary files differindex c267f66e..684eb266 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/sr@latin.gmo b/po/sr@latin.gmo Binary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differindex a3dc8c84..ef0225aa 100644 --- a/po/sr@latin.gmo +++ b/po/sr@latin.gmo diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex e3cc8eac..3a4bb9bc 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_HK.gmo b/po/zh_HK.gmo Binary files differindex 68821b14..ffa597f0 100644 --- a/po/zh_HK.gmo +++ b/po/zh_HK.gmo diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex e8d9f693..b6bb9298 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/test-fixtures/test-utils.c b/test-fixtures/test-utils.c index 59e3fd8c..7c58a50d 100644 --- a/test-fixtures/test-utils.c +++ b/test-fixtures/test-utils.c @@ -2,6 +2,10 @@ #include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + #include "test-unit.h" #include "test-utils.h" @@ -125,7 +129,7 @@ is_boolean_env_set (const char *variable) return ret; } -void +CoglBool test_utils_init (TestFlags requirement_flags, TestFlags known_failure_flags) { @@ -146,6 +150,11 @@ test_utils_init (TestFlags requirement_flags, "$ make test-report"); counter++; +#ifdef HAVE_ALARM + /* Kill the test with SIGALRM if it takes more than this many seconds */ + alarm (120); +#endif + if (is_boolean_env_set ("COGL_TEST_VERBOSE") || is_boolean_env_set ("V")) cogl_test_is_verbose = TRUE; @@ -204,6 +213,8 @@ test_utils_init (TestFlags requirement_flags, g_print ("WARNING: Missing required feature[s] for this test\n"); else if (known_failure) g_print ("WARNING: Test is known to fail\n"); + + return (!missing_requirement && !known_failure); } void @@ -298,7 +309,17 @@ void test_utils_check_pixel_rgb (CoglFramebuffer *test_fb, int x, int y, int r, int g, int b) { - test_utils_check_pixel (test_fb, x, y, (r << 24) | (g << 16) | (b << 8)); + g_return_if_fail (r >= 0); + g_return_if_fail (g >= 0); + g_return_if_fail (b >= 0); + g_return_if_fail (r <= 0xFF); + g_return_if_fail (g <= 0xFF); + g_return_if_fail (b <= 0xFF); + + test_utils_check_pixel (test_fb, x, y, + (((guint32) r) << 24) | + (((guint32) g) << 16) | + (((guint32) b) << 8)); } void diff --git a/test-fixtures/test-utils.h b/test-fixtures/test-utils.h index 9c3ced9b..e59163c8 100644 --- a/test-fixtures/test-utils.h +++ b/test-fixtures/test-utils.h @@ -69,7 +69,7 @@ typedef enum { extern CoglContext *test_ctx; extern CoglFramebuffer *test_fb; -void +CoglBool test_utils_init (TestFlags requirement_flags, TestFlags known_failure_flags); diff --git a/tests/conform/test-atlas-migration.c b/tests/conform/test-atlas-migration.c index 39e8a3c1..60502760 100644 --- a/tests/conform/test-atlas-migration.c +++ b/tests/conform/test-atlas-migration.c @@ -98,9 +98,9 @@ verify_texture (CoglTexture *texture, int size) }; test_utils_compare_pixel (p, - (real_color.red << 24) | - (real_color.green << 16) | - (real_color.blue << 8) | + (((guint32) real_color.red) << 24) | + (((guint32) real_color.green) << 16) | + (((guint32) real_color.blue) << 8) | opacity); g_assert_cmpint (p[3], ==, opacity); diff --git a/tests/conform/test-backface-culling.c b/tests/conform/test-backface-culling.c index e90c2f5e..c06ec79a 100644 --- a/tests/conform/test-backface-culling.c +++ b/tests/conform/test-backface-culling.c @@ -193,6 +193,9 @@ validate_result (CoglFramebuffer *framebuffer, int y_offset) cull_front = TRUE; cull_back = TRUE; break; + + default: + g_assert_not_reached (); } if (FRONT_WINDING (draw_num) == COGL_WINDING_CLOCKWISE) diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c index 9b6573d9..63ae15f9 100644 --- a/tests/conform/test-conform-main.c +++ b/tests/conform/test-conform-main.c @@ -15,10 +15,17 @@ extern void FUNC (void); \ if (strcmp (#FUNC, argv[1]) == 0) \ { \ - test_utils_init (REQUIREMENTS, KNOWN_FAIL_REQUIREMENTS); \ - FUNC (); \ - test_utils_fini (); \ - exit (0); \ + if (test_utils_init (REQUIREMENTS, KNOWN_FAIL_REQUIREMENTS) \ + || g_getenv ("COGL_TEST_TRY_EVERYTHING") != NULL) \ + { \ + FUNC (); \ + test_utils_fini (); \ + exit (0); \ + } \ + else \ + { \ + exit (1); \ + } \ } \ } G_STMT_END @@ -55,7 +62,7 @@ main (int argc, char **argv) ADD_TEST (test_pipeline_user_matrix, 0, 0); ADD_TEST (test_blend_strings, 0, 0); ADD_TEST (test_blend, 0, 0); - ADD_TEST (test_premult, 0, TEST_KNOWN_FAILURE); + ADD_TEST (test_premult, 0, 0); UNPORTED_TEST (test_readpixels); #ifdef COGL_HAS_COGL_PATH_SUPPORT ADD_TEST (test_path, 0, 0); diff --git a/tests/conform/test-premult.c b/tests/conform/test-premult.c index fa60bdf1..9ac7b680 100644 --- a/tests/conform/test-premult.c +++ b/tests/conform/test-premult.c @@ -49,6 +49,7 @@ make_texture (uint32_t color, CoglPixelFormat src_format, MakeTextureFlags flags) { + static CoglUserDataKey bitmap_free_key; CoglTexture2D *tex_2d; guchar *tex_data = gen_tex_data (color); CoglBitmap *bmp = cogl_bitmap_new_for_data (test_ctx, @@ -57,6 +58,10 @@ make_texture (uint32_t color, src_format, QUAD_WIDTH * 4, tex_data); + cogl_object_set_user_data (COGL_OBJECT (bmp), + &bitmap_free_key, + tex_data, + g_free); tex_2d = cogl_texture_2d_new_from_bitmap (bmp); @@ -66,7 +71,6 @@ make_texture (uint32_t color, cogl_texture_set_premultiplied (tex_2d, FALSE); cogl_object_unref (bmp); - g_free (tex_data); return tex_2d; } diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 7e62bf0f..3c02eb44 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -o pipefail + if test -z "$G_DEBUG"; then G_DEBUG=fatal-warnings else @@ -18,6 +20,8 @@ shift set +m +LOG=$(mktemp) + trap "" ERR trap "" SIGABRT trap "" SIGFPE @@ -62,17 +66,22 @@ get_status() run_test() { - $($TEST_BINARY $1 &>.log) + if [ -n "${VERBOSE-}" ]; then + echo "running $TEST_BINARY $1:" + $TEST_BINARY $1 2>&1 | tee "$LOG" + else + $($TEST_BINARY $1 &> "$LOG") + fi TMP=$? var_name=$2_result eval $var_name=$TMP - if grep -q "$MISSING_FEATURE" .log; then + if grep -q "$MISSING_FEATURE" "$LOG"; then if test $TMP -ne 0; then eval $var_name=500 else eval $var_name=400 fi - elif grep -q "$KNOWN_FAILURE" .log; then + elif grep -q "$KNOWN_FAILURE" "$LOG"; then if test $TMP -ne 0; then eval $var_name=300 else @@ -154,4 +163,6 @@ do echo "" done +rm "$LOG" + exit $EXIT diff --git a/tests/unit/test-unit-main.c b/tests/unit/test-unit-main.c index b1f78645..6065b083 100644 --- a/tests/unit/test-unit-main.c +++ b/tests/unit/test-unit-main.c @@ -36,10 +36,16 @@ main (int argc, char **argv) return 1; } - test_utils_init (unit_test->requirement_flags, - unit_test->known_failure_flags); - unit_test->run (); - test_utils_fini (); - - return 0; + if (test_utils_init (unit_test->requirement_flags, + unit_test->known_failure_flags) + || g_getenv ("COGL_TEST_TRY_EVERYTHING") != NULL) + { + unit_test->run (); + test_utils_fini (); + return 0; + } + else + { + return 1; + } } |